diff options
16 files changed, 45 insertions, 66 deletions
diff --git a/meta-amd/meta-daytonax/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-amd/meta-daytonax/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index b609180482..baaa233329 100644 --- a/meta-amd/meta-daytonax/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-amd/meta-daytonax/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,4 @@ DEPENDS:append:daytonax = " daytonax-yaml-config" -EXTRA_OECONF:daytonax = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/daytonax-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/daytonax-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML:daytonax="${STAGING_DIR_HOST}${datadir}/daytonax-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:daytonax="${STAGING_DIR_HOST}${datadir}/daytonax-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index d92ca4c050..3dac1b40fe 100644 --- a/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-amd/meta-ethanolx/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,4 @@ DEPENDS:append:ethanolx = " ethanolx-yaml-config" -EXTRA_OECONF:ethanolx = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML:ethanolx="${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:ethanolx="${STAGING_DIR_HOST}${datadir}/ethanolx-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 877a6ef444..edc17a0d75 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,4 @@ DEPENDS:append:g220a= " g220a-yaml-config" -EXTRA_OECONF:g220a= " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML:g220a="${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:g220a="${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 0c78a8f528..3d795c89d0 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-facebook/meta-bletchley/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -4,9 +4,7 @@ FILESEXTRAPATHS:prepend:bletchley := "${THISDIR}/${PN}:" DEPENDS:append:bletchley = " bletchley-yaml-config" -EXTRA_OECONF:bletchley = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml \ - " +IPMI_FRU_YAML:bletchley = "${STAGING_DIR_HOST}${datadir}/bletchley-yaml-config/ipmi-fru-read.yaml" EEPROM_NAMES = "bmc" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index cbd265e59b..f0f1c9b0d8 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,4 @@ DEPENDS:append:palmetto = " palmetto-yaml-config" -EXTRA_OECONF:palmetto = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML:palmetto="${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:palmetto="${STAGING_DIR_HOST}${datadir}/palmetto-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index bbdd2b2415..48a923648f 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,4 @@ DEPENDS:append:romulus = " romulus-yaml-config" -EXTRA_OECONF:romulus = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML:romulus = "${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:romulus = "${STAGING_DIR_HOST}${datadir}/romulus-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 69cc839bc7..707f382a42 100644 --- a/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,11 +1,7 @@ DEPENDS:append:ibm-ac-server = " acx22-yaml-config" DEPENDS:append:p10bmc = " p10bmc-yaml-config" -EXTRA_OECONF:ibm-ac-server = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML:ibm-ac-server="${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:ibm-ac-server="${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml" -EXTRA_OECONF:p10bmc = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/p10bmc-yaml-config/ipmi-fru-read.yaml \ - " +IPMI_FRU_YAML:p10bmc = "${STAGING_DIR_HOST}${datadir}/p10bmc-yaml-config/ipmi-fru-read.yaml" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index f1ba783e11..6079e70df6 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,4 @@ DEPENDS:append:zaius = " zaius-yaml-config" -EXTRA_OECONF:zaius = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML:zaius="${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:zaius="${STAGING_DIR_HOST}${datadir}/zaius-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 19bb4df9d4..cbe77871e9 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ DEPENDS:append:fp5280g2= " fp5280g2-yaml-config" -EXTRA_OECONF:fp5280g2= " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-extra-properties.yaml \ - " +EXTRA_OECONF:fp5280g2= "" + +IPMI_FRU_YAML:fp5280g2="${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:fp5280g2="${STAGING_DIR_HOST}${datadir}/fp5280g2-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc index fcc72b166e..15e7306493 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/ipmi-fru-parser" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=7702f203b58979ebbc31bfaeb44f219c" SRC_URI += "git://github.com/openbmc/ipmi-fru-parser;branch=master;protocol=https" -SRCREV = "06514028f879509bbc0a545011c3d50f045fb2cb" +SRCREV = "715334381680536d75b044271db36ff3beee48f1" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb index 4bf34d879e..fdd7d8e60f 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb @@ -3,12 +3,10 @@ DESCRIPTION = "A Phosphor IPMI plugin that updates inventory." DEPENDS += " \ virtual/phosphor-ipmi-fru-inventory \ virtual/phosphor-ipmi-fru-properties \ - systemd \ sdbusplus \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ phosphor-ipmi-host \ - autoconf-archive-native \ phosphor-logging \ cli11 \ " @@ -20,16 +18,20 @@ SRC_URI += "file://of-name-to-eeprom.sh" SYSTEMD_SERVICE:${PN} += "obmc-read-eeprom@.service" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit meson pkgconfig inherit obmc-phosphor-systemd inherit obmc-phosphor-ipmiprovider-symlink inherit phosphor-ipmi-fru inherit python3native -EXTRA_OECONF = " \ - YAML_GEN=${STAGING_DIR_NATIVE}${config_datadir}/config.yaml \ - PROP_YAML=${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml \ - " +IPMI_FRU_YAML ?= "${STAGING_DIR_NATIVE}${config_datadir}/config.yaml" +IPMI_FRU_PROP_YAML ?= "${STAGING_DIR_NATIVE}${properties_datadir}/extra-properties.yaml" + + +EXTRA_OEMESON = " \ + -Dfru_yaml=${IPMI_FRU_YAML} \ + -Dproperties_yaml=${IPMI_FRU_PROP_YAML} \ + " do_install:append() { install -d ${D}${bindir} diff --git a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index b9ea43e1cb..e4c9c45fb8 100644 --- a/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gbs/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -20,7 +20,7 @@ FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" SYSTEMD_LINK:${PN}:append:gbs := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" -EXTRA_OECONF:append:gbs = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-extra-properties.yaml \ - " +EXTRA_OECONF:append:gbs = "" + +IPMI_FRU_YAML:gbs="${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:gbs="${STAGING_DIR_HOST}${datadir}/gbs-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 04f25c1b0f..911f44b373 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -4,10 +4,10 @@ FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/${PN}:" DEPENDS:append:olympus-nuvoton = " olympus-nuvoton-yaml-config" -EXTRA_OECONF:olympus-nuvoton = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-extra-properties.yaml \ - " +EXTRA_OECONF:olympus-nuvoton = "" + +IPMI_FRU_YAML:olympus-nuvoton="${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:olympus-nuvoton="${STAGING_DIR_HOST}${datadir}/olympus-nuvoton-yaml-config/ipmi-extra-properties.yaml" EEPROM_NAMES = "motherboard bmc" diff --git a/meta-quanta/meta-s6q/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-s6q/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 6caa6a5e4f..7205184552 100644 --- a/meta-quanta/meta-s6q/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-s6q/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -20,7 +20,5 @@ FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" SYSTEMD_LINK:${PN}:append:s6q := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" -EXTRA_OECONF:append:s6q = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML:s6q="${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:s6q="${STAGING_DIR_HOST}${datadir}/s6q-yaml-config/ipmi-extra-properties.yaml" diff --git a/meta-ufispace/meta-ncplite/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ufispace/meta-ncplite/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index e858511dcf..7c54e18171 100644 --- a/meta-ufispace/meta-ncplite/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ufispace/meta-ncplite/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -7,10 +7,9 @@ FILESEXTRAPATHS:prepend:ncplite := "${THISDIR}/${PN}:" SRC_URI:append:ncplite = " file://ncplite-obmc-read-eeprom@.service \ " -EXTRA_OECONF:ncplite = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/ncplite-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/ncplite-yaml-config/ipmi-extra-properties.yaml \ - " + +IPMI_FRU_YAML:ncplite="${STAGING_DIR_HOST}${datadir}/ncplite-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML:ncplite="${STAGING_DIR_HOST}${datadir}/ncplite-yaml-config/ipmi-extra-properties.yaml" EEPROM_NAMES = "motherboard psu1 psu0" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 18f32c0cc1..f6b4cfa7b3 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,4 @@ DEPENDS:append = " nicole-yaml-config" -EXTRA_OECONF = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-extra-properties.yaml \ - " +IPMI_FRU_YAML="${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-fru-read.yaml" +IPMI_FRU_PROP_YAML="${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-extra-properties.yaml" |