diff options
15 files changed, 73 insertions, 74 deletions
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 7d52980c49..5e9f853117 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ DEPENDS:append:ethanolx = " ethanolx-yaml-config" -EXTRA_OECONF:ethanolx = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:ethanolx = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 910b99f3fc..d8d2390bba 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -2,7 +2,7 @@ FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" DEPENDS:append = " ${MACHINE}-yaml-config" -EXTRA_OECONF = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/${MACHINE}-yaml-config/ipmi-sensors.yaml \ +EXTRA_OEMESON = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/${MACHINE}-yaml-config/ipmi-sensors.yaml \ " diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 41a26d76c7..15e4111257 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -2,8 +2,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPENDS:append:g220a= " g220a-yaml-config" -EXTRA_OECONF:g220a= " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-sensors.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-inventory-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:g220a= " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-sensors.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-inventory-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 82bd0b4457..916dc2d34e 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ DEPENDS:append:bletchley = " bletchley-yaml-config" -EXTRA_OECONF:bletchley = " \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:bletchley = " \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml \ " # host watchdog does not support on bletchley diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 5c0f8f7836..096957324a 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ DEPENDS:append:palmetto = " palmetto-yaml-config" -EXTRA_OECONF:palmetto = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:palmetto = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 7a27e223df..aa88fe0efc 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ DEPENDS:append:romulus = " romulus-yaml-config" -EXTRA_OECONF:romulus = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-sensors.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-inventory-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:romulus = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-sensors.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-inventory-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 5eda840357..880532190b 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -5,16 +5,16 @@ DEPENDS:append:p10bmc = " p10bmc-yaml-config" # host watchdog does not work with witherspoon-tacoma host firmware RDEPENDS:${PN}:remove:witherspoon-tacoma = "virtual/obmc-watchdog" -EXTRA_OECONF:ibm-ac-server = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:ibm-ac-server = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ " -EXTRA_OECONF:mihawk = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:mihawk = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ " -EXTRA_OECONF:p10bmc = " \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/p10bmc-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:p10bmc = " \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/p10bmc-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index d592f9bd2d..817a624af5 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ DEPENDS:append:zaius = " zaius-yaml-config" -EXTRA_OECONF:zaius = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:zaius = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 31f2a99361..891f3fee4f 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ DEPENDS:append:fp5280g2= " fp5280g2-yaml-config" -EXTRA_OECONF:fp5280g2= " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-sensors.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-inventory-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:fp5280g2= " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-sensors.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-inventory-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 1b4c782610..0c66120fa2 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid;branch=master;protocol=https" -SRCREV = "33d90e182dd31b8f6bba66125d217fe0c62cfa18" +SRCREV = "0e7a8af0e50ad352e290e5ba5d63a3f178fb71d9" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb index 71db1e9f87..203a64b70d 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" RRECOMMENDS:${PN} += "packagegroup-obmc-ipmid-providers-libs" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-ipmiprovider-symlink inherit obmc-phosphor-sdbus-service inherit obmc-phosphor-systemd @@ -22,20 +22,19 @@ def ipmi_whitelists(d): return ' '.join(whitelists) PACKAGECONFIG ??= "allowlist i2c-allowlist boot-flag-safe-mode softoff libuserlayer" -PACKAGECONFIG[dynamic-sensors] = "--enable-dynamic-sensors,--disable-dynamic-sensors" -PACKAGECONFIG[hybrid-sensors] = "--enable-hybrid-sensors,--disable-hybrid-sensors" -PACKAGECONFIG[sel-logger-clears-sel] = "--enable-sel-logger-clears-sel,--disable-sel-logger-clears-sel" -PACKAGECONFIG[allowlist] = "--enable-ipmi-whitelist,--disable-ipmi-whitelist" -PACKAGECONFIG[i2c-allowlist] = "--enable-i2c-whitelist-check,--disable-i2c-whitelist-check" -PACKAGECONFIG[transport-oem] = "--enable-transport-oem,--disable-transport-oem" -PACKAGECONFIG[boot-flag-safe-mode] = "--enable-boot-flag-safe-mode-support,--disable-boot-flag-safe-mode-support" -PACKAGECONFIG[softoff] = "--enable-softoff,--disable-softoff" -PACKAGECONFIG[update-functional-on-fail] = "--enable-update-functional-on-fail,--disable-update-functional-on-fail" -PACKAGECONFIG[libuserlayer] = "--enable-libuserlayer,--disable-libuserlayer" -PACKAGECONFIG[sensors-cache] = "--enable-sensors-cache,--disable-sensors-cache" - - -DEPENDS += "autoconf-archive-native" +PACKAGECONFIG[dynamic-sensors] = "-Ddynamic-sensors=enabled,-Ddynamic-sensors=disabled" +PACKAGECONFIG[hybrid-sensors] = "-Dhybrid-sensors=enabled,-Dhybrid-sensors=disabled" +PACKAGECONFIG[sel-logger-clears-sel] = "-Dsel-logger-clears-sel=enabled,-Dsel-logger-clears-sel=disabled" +PACKAGECONFIG[allowlist] = "-Dipmi-whitelist=enabled,-Dipmi-whitelist=disabled" +PACKAGECONFIG[i2c-allowlist] = "-Di2c-whitelist-check=enabled,-Di2c-whitelist-check=disabled" +PACKAGECONFIG[transport-oem] = "-Dtransport-oem=enabled,-Dtransport-oem=disabled" +PACKAGECONFIG[boot-flag-safe-mode] = "-Dboot-flag-safe-mode-support=enabled,-Dboot-flag-safe-mode-support=disabled" +PACKAGECONFIG[softoff] = "-Dsoftoff=enabled,-Dsoftoff=disabled" +PACKAGECONFIG[update-functional-on-fail] = "-Dupdate-functional-on-fail=enabled,-Dupdate-functional-on-fail=disabled" +PACKAGECONFIG[libuserlayer] = "-Dlibuserlayer=enabled,-Dlibuserlayer=disabled" +PACKAGECONFIG[sensors-cache] = "-Dsensors-cache=enabled,-Dsensors-cache=disabled" + + DEPENDS += "nlohmann-json" DEPENDS += "phosphor-state-manager" DEPENDS += "${@ipmi_whitelists(d)}" @@ -55,8 +54,6 @@ DEPENDS += "${PYTHON_PN}-mako-native" VIRTUAL-RUNTIME_ipmi-config ?= "phosphor-ipmi-config" -RDEPENDS:${PN}-dev += "phosphor-logging" -RDEPENDS:${PN}-dev += "phosphor-mapper-dev" RDEPENDS:${PN} += "clear-once" RDEPENDS:${PN} += "phosphor-network" RDEPENDS:${PN} += "phosphor-time-manager" @@ -84,15 +81,17 @@ WHITELIST_CONF = " \ ${STAGING_DATADIR_NATIVE}/phosphor-ipmi-host/*.conf \ ${S}/host-ipmid-whitelist.conf \ " -EXTRA_OECONF = " \ - SENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/sensor.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \ - FRU_YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \ +EXTRA_OEMESON = " \ + -Dsensor-yaml-gen=${STAGING_DIR_NATIVE}${sensor_datadir}/sensor.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_NATIVE}${sensor_datadir}/invsensor.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_NATIVE}${config_datadir}/fru_config.yaml \ " -EXTRA_OECONF:append = " \ - WHITELIST_CONF="${WHITELIST_CONF}" \ +EXTRA_OEMESON:append = " \ + -Dwhitelist-conf="${WHITELIST_CONF}" \ " +EXTRA_OEMESON:append = " -Dtests=disabled" + S = "${WORKDIR}/git" SRC_URI += "file://merge_yamls.py " diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 181527fca9..99821d75e5 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -5,10 +5,10 @@ SRC_URI:append:gbs = " file://gbs-ipmid-whitelist.conf" WHITELIST_CONF:gbs = "${WORKDIR}/gbs-ipmid-whitelist.conf" -EXTRA_OECONF:append:gbs = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-inventory-sensors.yaml \ +EXTRA_OEMESON:append:gbs = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-inventory-sensors.yaml \ " RDEPENDS:${PN}:remove:gbs = "clear-once" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 929a61cc0b..739a6726c6 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,6 +1,6 @@ DEPENDS:append:olympus-nuvoton = " olympus-nuvoton-yaml-config" -EXTRA_OECONF:olympus-nuvoton = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON:olympus-nuvoton = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-quanta/meta-s6q/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-s6q/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 7dcd60eeff..cbf4c7f0fb 100644 --- a/meta-quanta/meta-s6q/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-quanta/meta-s6q/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -2,8 +2,8 @@ FILESEXTRAPATHS:prepend:s6q := "${THISDIR}/${PN}:" DEPENDS:append:s6q = " s6q-yaml-config" -EXTRA_OECONF:append:s6q = " \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-fru-read.yaml \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-sensors.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-inventory-sensors.yaml \ +EXTRA_OEMESON:append:s6q = " \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-fru-read.yaml \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-sensors.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-inventory-sensors.yaml \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index aa0ae99429..3415385eaa 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ DEPENDS:append = " nicole-yaml-config" -EXTRA_OECONF = " \ - SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-sensors.yaml \ - INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-inventory-sensors.yaml \ - FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-fru-read.yaml \ +EXTRA_OEMESON = " \ + -Dsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-sensors.yaml \ + -Dinvsensor-yaml-gen=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-inventory-sensors.yaml \ + -Dfru-yaml-gen=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-fru-read.yaml \ " |