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/flash/dummy-gbmc-update.bb | 4 ++-- meta-google/recipes-phosphor/flash/google-key.bb | 4 ++-- meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'meta-google/recipes-phosphor/flash') diff --git a/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb b/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb index 7eba3b0fc..4bff6e331 100644 --- a/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb +++ b/meta-google/recipes-phosphor/flash/dummy-gbmc-update.bb @@ -10,9 +10,9 @@ inherit systemd SRC_URI += "file://config-dummy.json" SRC_URI += "file://dummy-verify.service" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash" -SYSTEMD_SERVICE_${PN} += "dummy-verify.service" +SYSTEMD_SERVICE:${PN} += "dummy-verify.service" do_install() { install -d ${D}${datadir}/phosphor-ipmi-flash diff --git a/meta-google/recipes-phosphor/flash/google-key.bb b/meta-google/recipes-phosphor/flash/google-key.bb index 220211526..62d54f25e 100644 --- a/meta-google/recipes-phosphor/flash/google-key.bb +++ b/meta-google/recipes-phosphor/flash/google-key.bb @@ -5,8 +5,8 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN} += "gnupg" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "gnupg" SRC_URI += " \ file://platforms_gbmc_bringup.gpg \ diff --git a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb index c71a579e1..9e55afce5 100644 --- a/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb +++ b/meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb @@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd PROVIDES += "virtual/bmc-update" -RPROVIDES_${PN} += "virtual/bmc-update" +RPROVIDES:${PN} += "virtual/bmc-update" -RDEPENDS_${PN} += "google-key" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "google-key" +RDEPENDS:${PN} += "bash" SRC_URI += " \ file://config-bmc.json \ @@ -21,10 +21,10 @@ SRC_URI += " \ file://inplace-gbmc-version.sh \ " -SYSTEMD_SERVICE_${PN} += "inplace-gbmc-verify.service" -SYSTEMD_SERVICE_${PN} += "inplace-gbmc-version.service" +SYSTEMD_SERVICE:${PN} += "inplace-gbmc-verify.service" +SYSTEMD_SERVICE:${PN} += "inplace-gbmc-version.service" -FILES_${PN} += "${datadir}/phosphor-ipmi-flash" +FILES:${PN} += "${datadir}/phosphor-ipmi-flash" do_install() { sed -i 's,@ALLOW_DEV@,,' ${WORKDIR}/inplace-gbmc-verify.sh @@ -39,6 +39,6 @@ do_install() { install -m 0644 ${WORKDIR}/config-bmc.json ${D}${datadir}/phosphor-ipmi-flash } -do_install_prepend_dev() { +do_install:prepend:dev() { sed -i 's,@ALLOW_DEV@,--allow-dev,' ${WORKDIR}/inplace-gbmc-verify.sh } -- cgit v1.2.3