diff options
Diffstat (limited to 'meta-openpower/recipes-phosphor')
23 files changed, 101 insertions, 96 deletions
diff --git a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb deleted file mode 100644 index 3545018b3..000000000 --- a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Open POWER DBus Interfaces" -DESCRIPTION = "Generated bindings, using sdbus++, for the openpower YAML" -PR = "r1" -PV = "1.0+git${SRCPV}" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig -inherit python3native -inherit phosphor-dbus-yaml - -DEPENDS += "autoconf-archive-native" -DEPENDS += "${PYTHON_PN}-sdbus++-native" -DEPENDS += "phosphor-dbus-interfaces" - -SRC_URI += "git://github.com/openbmc/openpower-dbus-interfaces" -SRCREV = "109ded04f3fec7bbbd93f9c9956a355f4894a51f" - -PACKAGECONFIG ??= "libopenpower_dbus" -PACKAGECONFIG[libopenpower_dbus] = " \ - --enable-libopenpower_dbus, \ - --disable-libopenpower_dbus, \ - systemd sdbusplus, \ - libsystemd \ - " - -PACKAGECONFIG_remove_class-native = "libopenpower_dbus" -PACKAGECONFIG_remove_class-nativesdk = "libopenpower_dbus" - -BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openpower/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-openpower/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend deleted file mode 100644 index cab0c9b4e..000000000 --- a/meta-openpower/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -EXTRA_OECONF += " --enable-openpower-dbus-interfaces" diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-yaml-provider_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-yaml-provider_git.bb new file mode 100644 index 000000000..d03af4cdc --- /dev/null +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-yaml-provider_git.bb @@ -0,0 +1,10 @@ +SUMMARY = "openpower-debug-collector: install phosphor-logging yaml" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit phosphor-logging-yaml-provider +require openpower-debug-collector.inc + +S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/flash/host-fw_git.bb b/meta-openpower/recipes-phosphor/flash/host-fw_git.bb deleted file mode 100644 index 00fc1fd59..000000000 --- a/meta-openpower/recipes-phosphor/flash/host-fw_git.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "OpenPOWER Host Firmware Image" -DESCRIPTION = "Adds the OpenPOWER Host Firmware image to the BMC image" -PR = "r1" - -inherit allarch - -HOST_FW_LICENSE ?= "Apache-2.0" -HOST_FW_LIC_FILES_CHKSUM ?= "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -HOST_FW_SRC_URI ?= "" - -LICENSE = "${HOST_FW_LICENSE}" -LIC_FILES_CHKSUM = "${HOST_FW_LIC_FILES_CHKSUM}" -SRC_URI = "${HOST_FW_SRC_URI}" - -DEPENDS = "squashfs-tools-native" - -S = "${WORKDIR}" -B = "${WORKDIR}/build" -do_compile[cleandirs] = "${B}" - -do_compile() { - if [ -n "${HOST_FW_SRC_URI}" ]; then - unsquashfs -d ${B}/squashfs-root ${S}/pnor.xz.squashfs - fi -} - -do_install() { - install -d ${D}${datadir}/${BPN} - - if [ -n "${HOST_FW_SRC_URI}" ]; then - install -m 0440 ${B}/squashfs-root/* ${D}${datadir}/${BPN} - fi -} diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 930ad0ea3..1116f34f4 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -11,15 +11,29 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit autotools pkgconfig systemd inherit obmc-phosphor-dbus-service +# Static configuration. This is the default if no other layout is specified. +inherit ${@bb.utils.contains_any('DISTRO_FEATURES', \ + 'openpower-ubi-fs phosphor-mmc', \ + '', \ + 'openpower-software-manager-static', d)} + +# UBI layout inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-ubi-fs', \ 'openpower-software-manager-ubi', \ - 'openpower-software-manager-static', d)} + '', d)} +# eMMC layout +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'phosphor-mmc', \ + 'openpower-software-manager-mmc', \ + '', d)} + +# Virtual PNOR inherit ${@bb.utils.contains('DISTRO_FEATURES', 'openpower-virtual-pnor', \ 'openpower-software-manager-virtual-pnor', \ '', d)} PACKAGECONFIG[verify_pnor_signature] = "--enable-verify_pnor_signature,--disable-verify_pnor_signature" PACKAGECONFIG[ubifs_layout] = "--enable-ubifs_layout,--disable-ubifs_layout,,mtd-utils-ubifs" +PACKAGECONFIG[mmc_layout] = "--enable-mmc_layout,--disable-mmc_layout" PACKAGECONFIG[virtual_pnor] = "--enable-virtual_pnor,--disable-virtual_pnor" EXTRA_OECONF += " \ @@ -42,7 +56,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "4c955c31d96d4e3781abd9e9f9cf5c6aa1adfd56" +SRCREV = "7c053c3f496c73b73e7677713f3e22fb1d3e56ab" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb index e056d6d28..bedf65011 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi.bb +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi.bb @@ -8,12 +8,15 @@ inherit obmc-phosphor-systemd RDEPENDS_${PN} += "op-proc-control" -TGTFMT = "obmc-chassis-poweron@{0}.target" +TGTFMT_CHASSIS = "obmc-chassis-poweron@{0}.target" +TGTFMT_HOST = "obmc-host-startmin@{0}.target" TMPL_SCAN = "fsi-scan@.service" INSTFMT_SCAN = "fsi-scan@{0}.service" -FMT_SCAN = "../${TMPL_SCAN}:${TGTFMT}.requires/${INSTFMT_SCAN}" +FMT_SCAN_CHASSIS = "../${TMPL_SCAN}:${TGTFMT_CHASSIS}.wants/${INSTFMT_SCAN}" +FMT_SCAN_HOST = "../${TMPL_SCAN}:${TGTFMT_HOST}.wants/${INSTFMT_SCAN}" SYSTEMD_SERVICE_${PN} += "${TMPL_SCAN} fsi-enable.service fsi-disable.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_CHASSIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_SCAN_HOST', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service index d8f28882a..c37863e80 100644 --- a/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service +++ b/meta-openpower/recipes-phosphor/fsi/op-fsi/fsi-scan@.service @@ -4,7 +4,10 @@ Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Wants=obmc-host-start-pre@%i.target Before=obmc-host-start-pre@%i.target +After=op-cfam-reset.service Conflicts=obmc-chassis-poweroff@%i.target +Conflicts=obmc-host-stop@%i.target +ConditionPathExists=!/run/openbmc/mpreboot@%i [Service] ExecStart=/usr/bin/env openpower-proc-control scanFSI @@ -14,4 +17,5 @@ Type=oneshot RemainAfterExit=yes [Install] -RequiredBy=obmc-chassis-poweron@%i.target +WantedBy=obmc-chassis-poweron@%i.target +WantedBy=obmc-host-startmin@%i.target diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 9cb75f33e..521ff02b9 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -45,6 +45,14 @@ pkg_postinst_${PN}() { LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/op-enter-mpreboot@0.service" TARGET="../op-enter-mpreboot@.service" ln -s $TARGET $LINK + + # Only install phal reinit service if phal enabled + if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires + LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" + TARGET="../phal-reinit-devtree.service" + ln -s $TARGET $LINK + fi } pkg_prerm_${PN}() { @@ -63,4 +71,10 @@ pkg_prerm_${PN}() { rm $LINK LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/op-enter-mpreboot@0.service" rm $LINK + + # Only phal reinit service if phal enabled + if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" + rm $LINK + fi } diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 33d6e9084..1c21bad90 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "883a59d45f1b3e2277c3d77c7f853059b104aba4" +SRCREV = "5e5d44516abb293483a6fb80175c8858a4b1aa90" DEPENDS += " \ autoconf-archive-native \ @@ -36,4 +36,5 @@ SYSTEMD_SERVICE_${PN} += " \ ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ op-continue-mpreboot@.service \ op-enter-mpreboot@.service \ + ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ " diff --git a/meta-openpower/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openpower/recipes-phosphor/interfaces/bmcweb_%.bbappend index 632d240b8..1220c8efe 100644 --- a/meta-openpower/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-openpower/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,5 +1,4 @@ -EXTRA_OECMAKE_append_df-openpower = " \ - -DBMCWEB_ENABLE_REDFISH_DBUS_LOG_ENTRIES=ON \ - -DBMCWEB_ENABLE_LOGGING_MW=ON \ - -DBMCWEB_HTTP_REQ_BODY_LIMIT_MB=400 \ +EXTRA_OEMESON_append_df-openpower = " \ + -Dredfish-dbus-log=enabled \ + -Dhttp-body-limit=400 \ " diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb index f7640981f..f730d700e 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-host-ipmi-flash_git.bb @@ -12,8 +12,7 @@ DEPENDS += "phosphor-ipmi-host" DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" -DEPENDS += "openpower-dbus-interfaces openpower-dbus-interfaces-native" +DEPENDS += "phosphor-dbus-interfaces" TARGET_CFLAGS += "-fpic" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-yaml-provider_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-yaml-provider_git.bb new file mode 100644 index 000000000..7ebf3a9bc --- /dev/null +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem-yaml-provider_git.bb @@ -0,0 +1,10 @@ +SUMMARY = "openpower-ipmi-oem: install phosphor-logging yaml" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit phosphor-logging-yaml-provider +require openpower-ipmi-oem.inc + +S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb index 67350a3d7..f817dffa3 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb @@ -18,7 +18,7 @@ DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" +DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "virtual/phosphor-ipmi-inventory-sel" TARGET_CFLAGS += "-fpic" diff --git a/meta-openpower/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend b/meta-openpower/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend deleted file mode 100644 index 00d44c886..000000000 --- a/meta-openpower/recipes-phosphor/ipmi/phosphor-logging-error-logs-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS_append_df-openpower = " openpower-ipmi-oem-error-native" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index b62d64c0d..d311093a3 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,9 +9,12 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "117af99bfd4d05a1fc68b85566c107afa9a52b94" +SRCREV = "fb1905453908a6cfe0136bcf39b818e7e8ece225" S = "${WORKDIR}/git" DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei" FILES_${PN} += "${UNITDIR}/attn_handler.service" + +# This is required so that libhei is installed with the chip data files. +RDEPENDS_${PN} += "openpower-libhei" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb index 09c49fe22..dac844e1c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb @@ -8,6 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/openpower-libhei" PV = "0.1+git${SRCPV}" -SRCREV = "2467db800aa8414561ebbf1e1ff14098eac54cab" +SRCREV = "ba5dc16120f605ac570666dfed546bb261476bb1" S = "${WORKDIR}/git" + +inherit perlnative + +DEPENDS += "libxml2-native libxml-simple-perl-native" diff --git a/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend deleted file mode 100644 index c128cfe15..000000000 --- a/meta-openpower/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -DEPENDS_append_df-openpower = " \ - openpower-debug-collector-native \ - openpower-occ-control-native \ - " diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control-yaml-provider_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-yaml-provider_git.bb new file mode 100644 index 000000000..cb805a442 --- /dev/null +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control-yaml-provider_git.bb @@ -0,0 +1,10 @@ +SUMMARY = "openpower-occ-control: install phosphor-logging yaml" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit phosphor-logging-yaml-provider +require openpower-occ-control.inc + +S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index af272489e..845499cb3 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "e09627037774dfc98bb88253bc19044611445376" +SRCREV = "0032523808c4807f8e5b4753d68080062980b35f" diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bbappend b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bbappend new file mode 100644 index 000000000..e2e4c6c02 --- /dev/null +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-obmc-yaml-providers.bbappend @@ -0,0 +1,5 @@ +OBMC_YAML_PROVIDER_RECIPES += " \ + openpower-debug-collector-yaml-provider \ + openpower-ipmi-oem-yaml-provider \ + openpower-occ-control-yaml-provider \ + " diff --git a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index 04a3fbbb7..db3967a44 100644 --- a/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -2,7 +2,6 @@ SUMMARY = "OpenBMC for OpenPOWER - Applications" PR = "r1" inherit packagegroup -inherit obmc-phosphor-utils PROVIDES = "${PACKAGES}" PACKAGES = " \ @@ -30,10 +29,10 @@ RDEPENDS_${PN}-chassis = " \ obmc-host-failure-reboots \ " #Pull in obmc-fsi on all P9 OpenPOWER systems -RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'op-fsi', 'op-fsi')}" +RDEPENDS_${PN}-chassis += "${@bb.utils.contains('MACHINE_FEATURES', 'op-fsi', 'op-fsi', '', d)}" #Pull in p9-cfam-override on all P9 OpenPOWER systems -RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'p9-cfam-override', 'p9-cfam-override')}" +RDEPENDS_${PN}-chassis += "${@bb.utils.contains('MACHINE_FEATURES', 'p9-cfam-override', 'p9-cfam-override', '', d)}" SUMMARY_${PN}-fans = "OpenPOWER Fans" RDEPENDS_${PN}-fans = " \ diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 776961387..5f3152532 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "c4bd215eb8262b62c9d96524c1448313a15ba7f9" +SRCREV = "0246a4d7d00daeebc03c96ef479df5e8441ae581" 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() { |