From dd6464e1cc0370f85ae0d4ee319e04a0912c9553 Mon Sep 17 00:00:00 2001 From: George Liu Date: Sat, 7 Aug 2021 10:09:52 +0800 Subject: meta-inspur: Cleanup for Yocto override syntax change Refer to: https://lore.kernel.org/openbmc/YQ1FD5q8KbhbXVBK@heinlein/ ``` poky/scripts/contrib/convert-overrides.py meta-inspur git grep "_[a-z0-9_/-]*[ :]" -- meta-inspur | grep ".bb" git grep -l _fp5280g2 -- meta-inspur | xargs sed -i \ 's/_fp5280g2/:fp5280g2/' git grep -l _on5263m5 -- meta-inspur | xargs sed -i \ 's/_on5263m5/:on5263m5/' git grep -l _virtual -- meta-inspur | xargs sed -i \ 's/_virtual/:virtual/' ``` Signed-off-by: George Liu Change-Id: I5ef5039691caf5e33fb865da0fdd70d95d7e3bdf --- meta-inspur/meta-on5263m5/conf/local.conf.sample | 10 ++++----- .../meta-on5263m5/conf/machine/on5263m5.conf | 10 ++++----- .../recipes-inspur/inspur-uuid/inspur-uuid_git.bb | 2 +- .../packagegroups/packagegroup-inspur-apps.bb | 24 +++++++++++----------- .../sensors/phosphor-hwmon_%.bbappend | 4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'meta-inspur/meta-on5263m5') diff --git a/meta-inspur/meta-on5263m5/conf/local.conf.sample b/meta-inspur/meta-on5263m5/conf/local.conf.sample index 5defaa1d7..59f0046d7 100644 --- a/meta-inspur/meta-on5263m5/conf/local.conf.sample +++ b/meta-inspur/meta-on5263m5/conf/local.conf.sample @@ -114,7 +114,7 @@ PACKAGE_CLASSES ?= "package_rpm" # running the build on (i.e. building i686 packages on an x86_64 host). # Supported values are i686 and x86_64 #SDKMACHINE ?= "i686" -SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" +SANITY_TESTED_DISTROS:append ?= " RedHatEnterpriseWorkstation-6.*" # # Extra image configuration defaults @@ -138,7 +138,7 @@ SANITY_TESTED_DISTROS_append ?= " RedHatEnterpriseWorkstation-6.*" # There are other application targets that can be used here too, see # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. # We default to enabling the debugging tweaks. -EXTRA_IMAGE_FEATURES = "debug-tweaks" +EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # # Additional image features @@ -190,7 +190,7 @@ PATCHRESOLVE = "noop" # files and damages the build in ways which may not be easily recoverable. # It's necessary to monitor /tmp, if there is no space left the build will fail # with very exotic errors. -BB_DISKMON_DIRS = "\ +BB_DISKMON_DIRS ??= "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ @@ -224,8 +224,8 @@ BB_DISKMON_DIRS = "\ # By default qemu will build with a builtin VNC server where graphical output can be # seen. The two lines below enable the SDL backend too. This assumes there is a # libsdl library available on your build system. -PACKAGECONFIG_append_pn-qemu-native = " sdl" -PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" +PACKAGECONFIG:append:pn-qemu-native = " sdl" +PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl-native" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index 1c217913e..9f76457e4 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -4,11 +4,11 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" +PREFERRED_PROVIDER:virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER:virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER:virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER:virtual/obmc-system-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER:virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb b/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb index 2174da950..441f21819 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/inspur-uuid/inspur-uuid_git.bb @@ -17,7 +17,7 @@ DEPENDS += "phosphor-logging" DEPENDS += "gpioplus" -SYSTEMD_SERVICE_${PN} += "xyz.openbmc_project.inspur.identify_led.controller.service" +SYSTEMD_SERVICE:${PN} += "xyz.openbmc_project.inspur.identify_led.controller.service" SRC_URI = "git://github.com/inspur-bmc/inspur-uuid.git" diff --git a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb index 517b9eb77..12fcdaeb7 100644 --- a/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb +++ b/meta-inspur/meta-on5263m5/recipes-inspur/packagegroups/packagegroup-inspur-apps.bb @@ -16,30 +16,30 @@ PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-chassis = "Inspur Chassis" -RDEPENDS_${PN}-chassis = " \ +SUMMARY:${PN}-chassis = "Inspur Chassis" +RDEPENDS:${PN}-chassis = " \ obmc-control-chassis \ obmc-op-control-power \ obmc-host-failure-reboots \ " -SUMMARY_${PN}-fans = "Inspur Fans" -RDEPENDS_${PN}-fans = "" +SUMMARY:${PN}-fans = "Inspur Fans" +RDEPENDS:${PN}-fans = "" -SUMMARY_${PN}-flash = "Inspur Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "Inspur Flash" +RDEPENDS:${PN}-flash = " \ obmc-flash-bmc \ obmc-mgr-download \ obmc-control-bmc \ " -SUMMARY_${PN}-system = "Inspur System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "Inspur System" +RDEPENDS:${PN}-system = " \ bmcweb \ entity-manager \ phosphor-webui \ diff --git a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index ac03883e8..867c388bd 100644 --- a/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-inspur/meta-on5263m5/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_on5263m5= " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:on5263m5= " -Dnegative-errno-on-fail=true" CHIPS = " \ bus@1e78a000/i2c-bus@1c0/tmp112@48 \ -- cgit v1.2.3