diff options
author | Willy Tu <wltu@google.com> | 2021-08-06 19:37:35 +0300 |
---|---|---|
committer | Willy Tu <wltu@google.com> | 2021-08-07 01:06:52 +0300 |
commit | 4dd03cae7a0a4afe12b172d404d9587da6971925 (patch) | |
tree | 9abe426e5069992b1d9f6abe7d469a66da2f569a /meta-google/recipes-google | |
parent | 0cf84856dd417d9f087cfcac730bc2d2188e5bf6 (diff) | |
download | openbmc-4dd03cae7a0a4afe12b172d404d9587da6971925.tar.xz |
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>
Diffstat (limited to 'meta-google/recipes-google')
21 files changed, 68 insertions, 68 deletions
diff --git a/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb b/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb index 0755d4eab..0de07f93a 100644 --- a/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb +++ b/meta-google/recipes-google/acpi-power-state-daemon/acpi-power-state-daemon_git.bb @@ -12,7 +12,7 @@ DEPENDS += " \ systemd \ " -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ acpi-power-state.service \ host-s0-state.target \ host-s5-state.target \ diff --git a/meta-google/recipes-google/default-ca-dev/default-ca-dev.bb b/meta-google/recipes-google/default-ca-dev/default-ca-dev.bb index ecbb71267..3cce4cd46 100644 --- a/meta-google/recipes-google/default-ca-dev/default-ca-dev.bb +++ b/meta-google/recipes-google/default-ca-dev/default-ca-dev.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 SRC_URI += "file://certs/authority/" -FILES_${PN} = "${sysconfdir}/ssl/certs/authority/*" +FILES:${PN} = "${sysconfdir}/ssl/certs/authority/*" do_install(){ install -d ${D}${sysconfdir}/ssl/certs/authority diff --git a/meta-google/recipes-google/default-users/default-users.bb b/meta-google/recipes-google/default-users/default-users.bb index 76485ccd0..1dbf21577 100644 --- a/meta-google/recipes-google/default-users/default-users.bb +++ b/meta-google/recipes-google/default-users/default-users.bb @@ -8,16 +8,16 @@ EXCLUDE_FROM_WORLD = "1" DEPENDS = "bmcweb" DEPENDS += "phosphor-ipmi-host" DEPENDS += "phosphor-user-manager" -RDEPENDS_${PN} = "bmcweb" -RDEPENDS_${PN} += "phosphor-ipmi-host" -RDEPENDS_${PN} += "phosphor-user-manager" +RDEPENDS:${PN} = "bmcweb" +RDEPENDS:${PN} += "phosphor-ipmi-host" +RDEPENDS:${PN} += "phosphor-user-manager" inherit useradd USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-m -N -u 1000 -g 100 -s /bin/nologin \ +USERADD_PARAM:${PN} = "-m -N -u 1000 -g 100 -s /bin/nologin \ -G 'web,redfish,priv-admin' Megapede; " -GROUPMEMS_PARAM_${PN} = "-g priv-admin -a root; " -GROUPMEMS_PARAM_${PN} += "-g ipmi -a root; " +GROUPMEMS_PARAM:${PN} = "-g priv-admin -a root; " +GROUPMEMS_PARAM:${PN} += "-g ipmi -a root; " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" diff --git a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb index aeba2a991..3d5504ea1 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-i2c_git.bb @@ -16,9 +16,9 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-i2c" SRCREV = "b7d431199ac519e7c3cd5f3341d67f2ff0e09e10" -FILES_${PN}_append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/host-ipmid/lib*${SOLIBS}" -FILES_${PN}_append = " ${libdir}/net-ipmid/lib*${SOLIBS}" -FILES_${PN}-dev_append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" +FILES:${PN}:append = " ${libdir}/ipmid-providers/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/host-ipmid/lib*${SOLIBS}" +FILES:${PN}:append = " ${libdir}/net-ipmid/lib*${SOLIBS}" +FILES:${PN}-dev:append = " ${libdir}/ipmid-providers/lib*${SOLIBSDEV} ${libdir}/ipmid-providers/*.la" HOSTIPMI_PROVIDER_LIBRARY += "libi2ccmds.so" diff --git a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb index 801de4361..1310f7e00 100644 --- a/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb +++ b/meta-google/recipes-google/ipmi/google-ipmi-sys_git.bb @@ -21,15 +21,15 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/google-ipmi-sys" SRCREV = "b69209b498bf9b1c009c528e40280d13e68f8dbd" -FILES_${PN} += "${libdir}/ipmid-providers" +FILES:${PN} += "${libdir}/ipmid-providers" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} += " \ +SYSTEMD_SERVICE:${PN} += " \ gbmc-host-poweroff.target \ gbmc-psu-hardreset.target \ " EXTRA_OEMESON += "-Dtests=disabled" -CXXFLAGS_append_gbmc = '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else \ +CXXFLAGS:append:gbmc = '${@"" if not d.getVar("GBMC_NCSI_IF_NAME") else \ " -DNCSI_IPMI_CHANNEL=1 -DNCSI_IF_NAME=" + d.getVar("GBMC_NCSI_IF_NAME")}' diff --git a/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb b/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb index deaee7aac..881e623e9 100644 --- a/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb +++ b/meta-google/recipes-google/ipmi/ipmi-fru-sh.bb @@ -3,14 +3,14 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://lib.sh" S = "${WORKDIR}" DATA = "${datadir}/ipmi-fru" -FILES_${PN} += "${DATA}" +FILES:${PN} += "${DATA}" -do_install_append() { +do_install:append() { install -d -m0755 ${D}${DATA} install -m0644 lib.sh ${D}${DATA}/ } diff --git a/meta-google/recipes-google/ipmi/metrics-ipmi-blobs_git.bb b/meta-google/recipes-google/ipmi/metrics-ipmi-blobs_git.bb index 531d824dd..943747834 100644 --- a/meta-google/recipes-google/ipmi/metrics-ipmi-blobs_git.bb +++ b/meta-google/recipes-google/ipmi/metrics-ipmi-blobs_git.bb @@ -13,6 +13,6 @@ DEPENDS += " \ protobuf \ " -FILES_${PN} += "${libdir}/blob-ipmid" +FILES:${PN} += "${libdir}/blob-ipmid" EXTRA_OEMESON += "-Dtests=disabled" diff --git a/meta-google/recipes-google/nanopb/nanopb_0.4.5.bb b/meta-google/recipes-google/nanopb/nanopb_0.4.5.bb index 232872e75..1737cddb0 100644 --- a/meta-google/recipes-google/nanopb/nanopb_0.4.5.bb +++ b/meta-google/recipes-google/nanopb/nanopb_0.4.5.bb @@ -13,12 +13,12 @@ S = "${WORKDIR}/git" DEPENDS = "protobuf-native python3-protobuf" -RDEPENDS_${PN}-generator += "python3 python3-protobuf" +RDEPENDS:${PN}-generator += "python3 python3-protobuf" -PACKAGES_prepend = "${PN}-generator ${PN}-runtime " +PACKAGES:prepend = "${PN}-generator ${PN}-runtime " -FILES_${PN}-generator = "${libdir}/python* ${bindir}" +FILES:${PN}-generator = "${libdir}/python* ${bindir}" -FILES_${PN}-runtime = "${libdir}/*.so.*" +FILES:${PN}-runtime = "${libdir}/*.so.*" BBCLASSEXTEND = "native" diff --git a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb index 89890266b..6480be1da 100644 --- a/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb +++ b/meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb @@ -16,25 +16,25 @@ SRC_URI += " \ S = "${WORKDIR}" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ gbmc-ip-monitor \ ncsid \ nftables-systemd \ sslh \ " -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/gbmc-ip-monitor \ ${systemd_unitdir} \ " -SYSTEMD_SERVICE_${PN} += " \ +SYSTEMD_SERVICE:${PN} += " \ gbmc-ncsi-sslh.service \ gbmc-ncsi-sslh.socket \ gbmc-ncsi-set-nicenabled.service \ " -do_install_append() { +do_install:append() { if_name='${GBMC_NCSI_IF_NAME}' if [ -z "$if_name" ]; then echo "Missing if_name" >&2 diff --git a/meta-google/recipes-google/ncsi/ncsid_git.bb b/meta-google/recipes-google/ncsi/ncsid_git.bb index 1acb45116..a67a3104b 100644 --- a/meta-google/recipes-google/ncsi/ncsid_git.bb +++ b/meta-google/recipes-google/ncsi/ncsid_git.bb @@ -10,7 +10,7 @@ EXTRA_OEMESON = " \ -Dtests=disabled \ " -SYSTEMD_SERVICE_${PN} += " \ +SYSTEMD_SERVICE:${PN} += " \ dhcp4@.service \ dhcp6@.service \ ncsid@.service \ @@ -26,7 +26,7 @@ DEPENDS += " \ stdplus \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ bash \ busybox \ iputils-arping \ diff --git a/meta-google/recipes-google/networking/gbmc-bridge.bb b/meta-google/recipes-google/networking/gbmc-bridge.bb index 37af84baf..dea14f00b 100644 --- a/meta-google/recipes-google/networking/gbmc-bridge.bb +++ b/meta-google/recipes-google/networking/gbmc-bridge.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://-bmc-gbmcbr.netdev \ file://-bmc-gbmcbr.network.in \ @@ -22,14 +22,14 @@ SRC_URI += " \ file://gbmc-br-nft.sh \ " -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${datadir}/gbmc-ip-monitor \ ${systemd_unitdir}/network \ ${sysconfdir}/nftables \ ${sysconfdir}/avahi/services \ " -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ bash \ gbmc-ip-monitor \ mstpd-mstpd \ @@ -37,7 +37,7 @@ RDEPENDS_${PN}_append = " \ ndisc6-rdisc6 \ " -SYSTEMD_SERVICE_${PN} += "gbmc-br-ensure-ra.service" +SYSTEMD_SERVICE:${PN} += "gbmc-br-ensure-ra.service" GBMC_BR_MAC_ADDR ?= "" @@ -98,7 +98,7 @@ do_install() { install -m0755 ${WORKDIR}/gbmc-br-ensure-ra.service ${D}${systemd_system_unitdir}/ } -do_rm_work_prepend() { +do_rm_work:prepend() { # HACK: Work around broken do_rm_work not properly calling rm with `--` # It doesn't like filenames that start with `-` rm -rf -- ${WORKDIR}/-* diff --git a/meta-google/recipes-google/networking/gbmc-ip-monitor.bb b/meta-google/recipes-google/networking/gbmc-ip-monitor.bb index 32804302b..1bf35bc9c 100644 --- a/meta-google/recipes-google/networking/gbmc-ip-monitor.bb +++ b/meta-google/recipes-google/networking/gbmc-ip-monitor.bb @@ -15,18 +15,18 @@ S = "${WORKDIR}" DEPENDS += "test-sh" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ bash \ iproute2 \ " -SYSTEMD_SERVICE_${PN} += "gbmc-ip-monitor.service" +SYSTEMD_SERVICE:${PN} += "gbmc-ip-monitor.service" do_compile() { SYSROOT="$PKG_CONFIG_SYSROOT_DIR" bash gbmc-ip-monitor-test.sh || exit } -do_install_append() { +do_install:append() { install -d -m0755 ${D}${libexecdir} install -m0755 gbmc-ip-monitor.sh ${D}${libexecdir}/ diff --git a/meta-google/recipes-google/networking/gbmc-iperf3.bb b/meta-google/recipes-google/networking/gbmc-iperf3.bb index 27ebdb7e0..3b78a405f 100644 --- a/meta-google/recipes-google/networking/gbmc-iperf3.bb +++ b/meta-google/recipes-google/networking/gbmc-iperf3.bb @@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd -RDEPENDS_${PN} += "iperf3" +RDEPENDS:${PN} += "iperf3" SRC_URI += "file://iperf3.service" -SYSTEMD_SERVICE_${PN} += "iperf3.service" +SYSTEMD_SERVICE:${PN} += "iperf3.service" do_install() { # Install service definitions @@ -18,7 +18,7 @@ do_install() { } # Allow IPERF3 to run on the gbmcbr node on DEV builds -do_install_append_dev() { +do_install:append:dev() { nftables_dir=${D}${sysconfdir}/nftables rules=$nftables_dir/50-gbmc-iperf3-dev.rules install -d -m0755 $nftables_dir diff --git a/meta-google/recipes-google/networking/gbmc-mac-config.bb b/meta-google/recipes-google/networking/gbmc-mac-config.bb index 6ca4c798b..7a3781d1f 100644 --- a/meta-google/recipes-google/networking/gbmc-mac-config.bb +++ b/meta-google/recipes-google/networking/gbmc-mac-config.bb @@ -12,14 +12,14 @@ SRC_URI += " \ S = "${WORKDIR}" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ bash \ ipmi-fru-sh \ " -FILES_${PN} += "${systemd_unitdir}" +FILES:${PN} += "${systemd_unitdir}" -SYSTEMD_SERVICE_${PN} += "gbmc-mac-config.service" +SYSTEMD_SERVICE:${PN} += "gbmc-mac-config.service" GBMC_MAC_EEPROM_OF_NAME ?= "" @@ -28,7 +28,7 @@ GBMC_MAC_EEPROM_OF_NAME ?= "" # Ex. "[0]=eth0 [2]=eth2" GBMC_MAC_IF_MAP ?= "" -do_install_append() { +do_install:append() { if [ -z '${GBMC_MAC_EEPROM_OF_NAME}' ]; then echo 'Missing GBMC_MAC_EEPROM_OF_NAME' >&2 exit 1 diff --git a/meta-google/recipes-google/networking/google-usb-network_git.bb b/meta-google/recipes-google/networking/google-usb-network_git.bb index ec51eaa5b..f0d15b94e 100644 --- a/meta-google/recipes-google/networking/google-usb-network_git.bb +++ b/meta-google/recipes-google/networking/google-usb-network_git.bb @@ -6,16 +6,16 @@ PV = "0.2" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -FILESEXTRAPATHS_prepend = "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend = "${THISDIR}/${PN}:" inherit systemd DEPENDS += "m4-native" DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "usb_network.service" +SYSTEMD_SERVICE:${PN} = "usb_network.service" BMC_IP_ADDR ??= "169.254.95.118/16" BMC_USB_ECM_PRODUCT_ID ??= "" @@ -30,8 +30,8 @@ SRC_URI += "file://00-bmc-usb0.network.m4" SRC_URI += "file://usb_network.service.m4" SRC_URI += "file://usb_network.sh" -FILES_${PN} = "${bindir}/usb_network.sh" -FILES_${PN}_append = " ${systemd_unitdir}/network/${BMC_USB_CONFIG_FILENAME}" +FILES:${PN} = "${bindir}/usb_network.sh" +FILES:${PN}:append = " ${systemd_unitdir}/network/${BMC_USB_CONFIG_FILENAME}" do_compile() { test "X${BMC_IP_ADDR}" != "X" || bberror "Please define BMC_IP_ADDR" diff --git a/meta-google/recipes-google/networking/network-sh.bb b/meta-google/recipes-google/networking/network-sh.bb index a377b9e2a..921795b00 100644 --- a/meta-google/recipes-google/networking/network-sh.bb +++ b/meta-google/recipes-google/networking/network-sh.bb @@ -3,13 +3,13 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://lib.sh" SRC_URI += "file://test.sh" S = "${WORKDIR}" DATA = "${datadir}/network" -FILES_${PN} += "${DATA}" +FILES:${PN} += "${DATA}" DEPENDS += "test-sh" @@ -17,7 +17,7 @@ do_compile() { SYSROOT="$PKG_CONFIG_SYSROOT_DIR" bash test.sh || exit } -do_install_append() { +do_install:append() { install -d -m0755 ${D}${DATA} install -m0644 lib.sh ${D}${DATA}/ } diff --git a/meta-google/recipes-google/nftables/nftables-systemd.bb b/meta-google/recipes-google/nftables/nftables-systemd.bb index f4109ddc7..21a8b1aeb 100644 --- a/meta-google/recipes-google/nftables/nftables-systemd.bb +++ b/meta-google/recipes-google/nftables/nftables-systemd.bb @@ -13,9 +13,9 @@ SRC_URI += " \ file://nftables.service \ " -SYSTEMD_SERVICE_${PN} += "nftables.service" +SYSTEMD_SERVICE:${PN} += "nftables.service" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ bash \ nftables \ " diff --git a/meta-google/recipes-google/ssh/authorized-keys-comp.bb b/meta-google/recipes-google/ssh/authorized-keys-comp.bb index 81ee868a8..ef0379286 100644 --- a/meta-google/recipes-google/ssh/authorized-keys-comp.bb +++ b/meta-google/recipes-google/ssh/authorized-keys-comp.bb @@ -12,15 +12,15 @@ SRC_URI += " \ S = "${WORKDIR}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" -SYSTEMD_SERVICE_${PN} += "authorized-keys-comp.service" +SYSTEMD_SERVICE:${PN} += "authorized-keys-comp.service" -FILES_${PN} += "/home" +FILES:${PN} += "/home" AUTHORIZED_KEYS_COMP_USERS ?= "root" -do_install_append() { +do_install:append() { install -d -m0755 ${D}${libexecdir} install -m0755 authorized-keys-comp.sh ${D}${libexecdir}/ diff --git a/meta-google/recipes-google/ssh/gbmc-dev-ssh-key.bb b/meta-google/recipes-google/ssh/gbmc-dev-ssh-key.bb index a9d371e70..a402f511f 100644 --- a/meta-google/recipes-google/ssh/gbmc-dev-ssh-key.bb +++ b/meta-google/recipes-google/ssh/gbmc-dev-ssh-key.bb @@ -7,7 +7,7 @@ SRC_URI += "file://gbmc-dev.pub" S = "${WORKDIR}" -FILES_${PN} += " ${datadir}/authorized_keys.d" +FILES:${PN} += " ${datadir}/authorized_keys.d" do_install() { install -d ${D}${datadir}/authorized_keys.d/root diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb index 29d81f46a..6e26fc99d 100644 --- a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb +++ b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb @@ -7,23 +7,23 @@ inherit systemd S = "${WORKDIR}" -SRC_URI_append = " \ +SRC_URI:append = " \ file://firmware-updates.target \ file://firmware-updates-pre.target \ file://40-gbmc-forward.conf \ " -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ ${systemd_unitdir}/coredump.conf.d/40-gbmc-coredump.conf \ ${systemd_unitdir}/resolved.conf.d/40-gbmc-nomdns.conf \ ${libdir}/sysctl.d/40-gbmc-forward.conf \ " -FILES_${PN}_append_dev = " \ +FILES:${PN}:append:dev = " \ ${libdir}/sysctl.d/40-gbmc-debug.conf \ " -SYSTEMD_SERVICE_${PN}_append = " \ +SYSTEMD_SERVICE:${PN}:append = " \ firmware-updates.target \ firmware-updates-pre.target \ " @@ -46,7 +46,7 @@ do_install() { install -m 0644 ${WORKDIR}/40-gbmc-forward.conf ${D}${libdir}/sysctl.d/ } -do_install_append_dev() { +do_install:append:dev() { printf "kernel.sysrq = 1\n" \ >${D}${libdir}/sysctl.d/40-gbmc-debug.conf } diff --git a/meta-google/recipes-google/test/test-sh.bb b/meta-google/recipes-google/test/test-sh.bb index 7edbb9189..eaca13739 100644 --- a/meta-google/recipes-google/test/test-sh.bb +++ b/meta-google/recipes-google/test/test-sh.bb @@ -3,19 +3,19 @@ PR = "r1" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://lib.sh" SRC_URI += "file://test.sh" S = "${WORKDIR}" DATA = "${datadir}/test" -FILES_${PN} += "${DATA}" +FILES:${PN} += "${DATA}" do_compile() { SYSROOT="$PKG_CONFIG_SYSROOT_DIR" bash test.sh || exit } -do_install_append() { +do_install:append() { install -d -m0755 ${D}${DATA} install -m0644 lib.sh ${D}${DATA}/ } |