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 <wltu@google.com>
diff --git a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 942dfc1..dce8682 100644
--- a/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-google/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,25 +1,25 @@
-OBMC_IMAGE_EXTRA_INSTALL_append = " google-ipmi-sys"
-OBMC_IMAGE_EXTRA_INSTALL_append = " google-ipmi-i2c"
-OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-blobs"
-OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-ethstats"
-OBMC_IMAGE_EXTRA_INSTALL_append = " phosphor-ipmi-flash"
+OBMC_IMAGE_EXTRA_INSTALL:append = " google-ipmi-sys"
+OBMC_IMAGE_EXTRA_INSTALL:append = " google-ipmi-i2c"
+OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-blobs"
+OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-ethstats"
+OBMC_IMAGE_EXTRA_INSTALL:append = " phosphor-ipmi-flash"
# Google BMC (gBMC) specific installs
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " iproute2 iproute2-ss"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-systemd-config"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " gbmc-iperf3"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " authorized-keys-comp"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc_dev = " gbmc-dev-ssh-key"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " iproute2 iproute2-ss"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-systemd-config"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " gbmc-iperf3"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " authorized-keys-comp"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc:dev = " gbmc-dev-ssh-key"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \
'${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else " gbmc-ncsi-config"}'
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = \
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = \
'${@"" if not d.getVar("GBMC_MAC_EEPROM_OF_NAME") else " gbmc-mac-config"}'
# Include these useful utilities for all gbmc platforms
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " ipmitool"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " iotools"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " lrzsz"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " ipmitool"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " iotools"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " lrzsz"
# Add gBMC update recipes
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " dummy-gbmc-update"
-OBMC_IMAGE_EXTRA_INSTALL_append_gbmc = " virtual/bmc-update"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " dummy-gbmc-update"
+OBMC_IMAGE_EXTRA_INSTALL:append:gbmc = " virtual/bmc-update"