From 4dd03cae7a0a4afe12b172d404d9587da6971925 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Fri, 6 Aug 2021 09:37:35 -0700 Subject: meta-google: Cleanup for Yocto override syntax change ``` convert-overrides.py meta-google git grep "_[a-z0-9_/-]*[ :]" -- meta-google | grep ".bb" git grep -l _gbmc -- meta-google | grep ".bb" \ | xargs sed -i 's/_gbmc/:gbmc/' git grep -l _prod -- meta-google | grep ".bb" \ | xargs sed -i 's/_prod/:prod/' git grep -l _dev -- meta-google | grep ".bb" \ | xargs sed -i 's/_dev/:dev/' git grep -l _hoth -- meta-google | grep ".bb" \ | xargs sed -i 's/_hoth/:hoth/' git grep -l _bandaid -- meta-google | grep ".bb" \ | xargs sed -i 's/_bandaid/:bandaid/' ``` Some small fix includes ``` platforms_gbmc_bringup platforms_gbmc_secure ``` Tested: ``` $ git grep "_[a-z0-9_/-]*[ :]" -- meta-google | grep ".bb" meta-google/recipes-connectivity/avahi/avahi_%.bbappend:do_install:append:gbmc() { meta-google/recipes-core/dropbear/dropbear_%.bbappend:do_install:append:gbmc:dev() { meta-google/recipes-core/dropbear/dropbear_%.bbappend: echo ' chain gbmc_br_pub_input {' >>"$rules" meta-google/recipes-extended/libconfig/conf2struct-native_git.bb: oe_runmake checker meta-google/recipes-extended/libconfig/conf2struct-native_git.bb: oe_runmake install meta-google/recipes-extended/networking/mstpd_git.bb:do_install:append() { meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake distclean meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake sslh-conf.h meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake install meta-google/recipes-google/ipmi/ipmi-fru-sh.bb:do_install:append() { meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb:do_install:append() { meta-google/recipes-google/networking/gbmc-bridge.bb:do_rm_work:prepend() { meta-google/recipes-google/networking/gbmc-bridge.bb: # HACK: Work around broken do_rm_work not properly calling rm with `--` meta-google/recipes-google/networking/gbmc-ip-monitor.bb:do_install:append() { meta-google/recipes-google/networking/gbmc-iperf3.bb:do_install:append:dev() { meta-google/recipes-google/networking/gbmc-iperf3.bb: echo ' chain gbmc_br_pub_input {' >>"$rules" meta-google/recipes-google/networking/gbmc-mac-config.bb:do_install:append() { meta-google/recipes-google/networking/network-sh.bb:do_install:append() { meta-google/recipes-google/ssh/authorized-keys-comp.bb:SUMMARY = "Compiles a set of authorized_keys files into a single file" meta-google/recipes-google/ssh/authorized-keys-comp.bb:do_install:append() { meta-google/recipes-google/systemd/gbmc-systemd-config.bb:do_install:append:dev() { meta-google/recipes-google/test/test-sh.bb:do_install:append() { meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb:do_install:prepend:dev() { meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend:do_install:append:gbmc:dev() { meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend:do_install:append:gbmc:dev() { meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend:do_install:append:gbmc:prod() { meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend:do_install:append:gbmc() { meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend: overlapping="$(jq '."${GBMCBR_IPMI_CHANNEL}" | .is_valid and .name != "gbmcbr"' $chjson)" ``` Change-Id: I9d610c664bd44e8bd81fb8f7e76249a0b43b9ffd Signed-off-by: Willy Tu --- meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 8 ++++---- .../recipes-phosphor/ipmi/phosphor-ipmi-ethstats_%.bbappend | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-google/recipes-phosphor/ipmi') 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" -- cgit v1.2.3