summaryrefslogtreecommitdiff
path: root/meta-quanta/meta-gsj/recipes-gsj
diff options
context:
space:
mode:
authorWilly Tu <wltu@google.com>2021-08-11 01:33:55 +0300
committerPatrick Williams <patrick@stwcx.xyz>2021-08-11 20:30:35 +0300
commita38b7ccc3fc59b7375d1f317691e3f753e228e0f (patch)
treec3e5d7d6ac7ef21ca7d33bdc0cf25ed381d4d15b /meta-quanta/meta-gsj/recipes-gsj
parentb96c75046da8f72359d101c813f0694409bbe0d1 (diff)
downloadopenbmc-a38b7ccc3fc59b7375d1f317691e3f753e228e0f.tar.xz
meta-quanta: meta-gsj: Cleanup for Yocto override syntax change
Cleanup with ``` convert-overrides.py meta-quanta/meta-gsj git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gsj git grep -l _gsj -- meta-quanta/meta-gsj \ | xargs sed -i 's/_gsj/:gsj/' ``` Note: Need to revert the change to BBFILE_PATTERN and LAYERSERIES_COMPAT. After cleanup ``` $ git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gsj/ | grep '.bb' meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend:do_install:append:gsj () { meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend:do_install:append:gsj() { meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb:do_install:append:gsj() { meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb:do_install () { meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend:do_install:append:gsj() { meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend:do_install:append:gsj() { ``` Change-Id: I058371ed32214d665aaaf616a650c2efeaf5be66 Signed-off-by: Willy Tu <wltu@google.com>
Diffstat (limited to 'meta-quanta/meta-gsj/recipes-gsj')
-rw-r--r--meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb10
-rw-r--r--meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb8
-rw-r--r--meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb18
-rw-r--r--meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb8
-rw-r--r--meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb10
5 files changed, 27 insertions, 27 deletions
diff --git a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb
index 24ca38d8f..17f1fc826 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb
@@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
inherit systemd
DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
-FILESEXTRAPATHS_append_gsj := "${THISDIR}/files:"
-SRC_URI_append_gsj = " file://detect-fan-fail.sh \
+FILESEXTRAPATHS:append:gsj := "${THISDIR}/files:"
+SRC_URI:append:gsj = " file://detect-fan-fail.sh \
file://detect-fan-fail.service \
"
-do_install_append_gsj() {
+do_install:append:gsj() {
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/detect-fan-fail.sh ${D}${bindir}/
@@ -23,4 +23,4 @@ do_install_append_gsj() {
}
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "detect-fan-fail.service"
+SYSTEMD_SERVICE:${PN} = "detect-fan-fail.service"
diff --git a/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb
index f9d9a9e47..d88b9a2f1 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/gsj-hotswap-change-setting/gsj-hotswap-change-setting.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5
inherit systemd
DEPENDS += "systemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append = " file://gsj-hotswap-change-setting.sh \
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+SRC_URI:append = " file://gsj-hotswap-change-setting.sh \
file://gsj-hotswap-change-setting.service \
"
@@ -23,4 +23,4 @@ do_install() {
}
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "gsj-hotswap-change-setting.service"
+SYSTEMD_SERVICE:${PN} = "gsj-hotswap-change-setting.service"
diff --git a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
index c1a7c1c10..1d416c4b3 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb
@@ -14,17 +14,17 @@ PROVIDES += "virtual/obmc-chassis-mgmt"
PROVIDES += "virtual/obmc-fan-mgmt"
PROVIDES += "virtual/obmc-flash-mgmt"
-RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt"
-RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt"
-RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt"
+RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt"
+RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt"
+RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt"
-SUMMARY_${PN}-chassis = "GSJ Chassis"
-RDEPENDS_${PN}-chassis = ""
+SUMMARY:${PN}-chassis = "GSJ Chassis"
+RDEPENDS:${PN}-chassis = ""
-SUMMARY_${PN}-fans = "GSJ Fans"
-RDEPENDS_${PN}-fans = ""
+SUMMARY:${PN}-fans = "GSJ Fans"
+RDEPENDS:${PN}-fans = ""
-SUMMARY_${PN}-flash = "GSJ Flash"
-RDEPENDS_${PN}-flash = " \
+SUMMARY:${PN}-flash = "GSJ Flash"
+RDEPENDS:${PN}-flash = " \
phosphor-ipmi-flash \
"
diff --git a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb
index 887b50305..a5f5084f3 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb
@@ -4,13 +4,13 @@ PR = "r1"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
inherit systemd
DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
SRC_URI += "file://init_once.sh \
file://nvme_powermanager.sh \
@@ -33,4 +33,4 @@ do_install () {
}
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "nvme_gpio.service nvme_powermanager.service"
+SYSTEMD_SERVICE:${PN} = "nvme_gpio.service nvme_powermanager.service"
diff --git a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb
index ad46c0b32..63e6d5d13 100644
--- a/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb
+++ b/meta-quanta/meta-gsj/recipes-gsj/usb-network/usb-network.bb
@@ -1,10 +1,10 @@
-FILESEXTRAPATHS_append := "${THISDIR}/files:"
+FILESEXTRAPATHS:append := "${THISDIR}/files:"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
DEPENDS += "systemd"
-RDEPENDS_${PN} += "libsystemd"
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "libsystemd"
+RDEPENDS:${PN} += "bash"
SRC_URI += "file://usb_network.sh \
file://usb_network.service \
@@ -23,7 +23,7 @@ do_install() {
NATIVE_SYSTEMD_SUPPORT = "1"
SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "usb_network.service"
-FILES_${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
+SYSTEMD_SERVICE:${PN} = "usb_network.service"
+FILES:${PN} += "${sysconfdir_native}/systemd/network/00-bmc-usb0.network"
inherit allarch systemd \ No newline at end of file