diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
| commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
| tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb | |
| parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
| parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
| download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz | |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb')
| -rw-r--r-- | meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb index b82ae84da..da31ab906 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Parse OpenPOWER-format FRU VPD and update inventory" PR = "r1" PV = "1.0+git${SRCPV}" -inherit autotools pkgconfig +inherit meson pkgconfig inherit openpower-fru-vpd inherit python3native inherit obmc-phosphor-systemd @@ -27,9 +27,10 @@ SYSTEMD_SERVICE_${PN} += "op-vpd-parser.service" S = "${WORKDIR}/git" -EXTRA_OECONF = " \ - FRU_YAML=${STAGING_DIR_NATIVE}${vpdlayout_datadir}/layout.yaml \ - PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/out.yaml \ +EXTRA_OEMESON = " \ + -Dtests=disabled \ + -DFRU_YAML=${STAGING_DIR_NATIVE}${vpdlayout_datadir}/layout.yaml \ + -DPROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/out.yaml \ " do_install_append() { |