diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-google/recipes-phosphor/ipmi | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-google/recipes-phosphor/ipmi')
-rw-r--r-- | meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 8 | ||||
-rw-r--r-- | meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 03e99b2d0..56f7933d4 100644 --- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1,13 +1,13 @@ -FILESEXTRAPATHS_prepend_gbmc := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gbmc := "${THISDIR}/${PN}:" -SRC_URI_append_gbmc = " file://gbmc_bridge.json" +SRC_URI:append:gbmc = " file://gbmc_bridge.json" -DEPENDS_append_gbmc = " jq-native" +DEPENDS:append:gbmc = " jq-native" GBMCBR_IPMI_CHANNEL ?= "11" # Replace a channel in config.json to add gbmcbr reporting -do_install_append_gbmc() { +do_install:append:gbmc() { chjson=${D}${datadir}/ipmi-providers/channel_config.json overlapping="$(jq '."${GBMCBR_IPMI_CHANNEL}" | .is_valid and .name != "gbmcbr"' $chjson)" if [ "$overlapping" != "false" ]; then diff --git a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend index 4519baea6..0c05a9ece 100644 --- a/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend +++ b/meta-google/recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend @@ -1,2 +1,2 @@ # Enable registration via Google OEM Number in addition to OpenBMC. -EXTRA_OECONF_append = " --enable-google" +EXTRA_OECONF:append = " --enable-google" |