From d876cfc5bfafa516dee55d04b50b319a22165640 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 28 Jul 2021 14:22:43 -0400 Subject: global: overrides syntax conversion OEcore/bitbake are moving to use the clearer ":" as an overrides separator. This is pass one of updating the meta-virt recipes to use that syntax. This has only been minimally build/runtime tested, more changes will be required for missed overrides, or incorrect conversions Note: A recent bitbake is required: commit 75fad23fc06c008a03414a1fc288a8614c6af9ca Author: Richard Purdie Date: Sun Jul 18 12:59:15 2021 +0100 bitbake: data_smart/parse: Allow ':' characters in variable/function names It is becomming increasingly clear we need to find a way to show what is/is not an override in our syntax. We need to do this in a way which is clear to users, readable and in a way we can transition to. The most effective way I've found to this is to use the ":" charater to directly replace "_" where an override is being specified. This includes "append", "prepend" and "remove" which are effectively special override directives. This patch simply adds the character to the parser so bitbake accepts the value but maps it back to "_" internally so there is no behaviour change. This change is simple enough it could potentially be backported to older version of bitbake meaning layers using the new syntax/markup could work with older releases. Even if other no other changes are accepted at this time and we don't backport, it does set us on a path where at some point in future we could require a more explict syntax. I've tested this patch by converting oe-core/meta-yocto to the new syntax for overrides (9000+ changes) and then seeing that builds continue to work with this patch. (Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284) Signed-off-by: Richard Purdie Signed-off-by: Bruce Ashfield --- classes/cni_networking.bbclass | 10 +++++----- classes/image-oci-sloci-image.inc | 2 +- classes/image-oci-umoci.inc | 2 +- classes/image-oci.bbclass | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'classes') diff --git a/classes/cni_networking.bbclass b/classes/cni_networking.bbclass index 9df02b81..2e81d63f 100644 --- a/classes/cni_networking.bbclass +++ b/classes/cni_networking.bbclass @@ -1,12 +1,12 @@ -DEPENDS_append_class-target = " cni" +DEPENDS:append:class-target = " cni" -PACKAGES_prepend = "${PN}-cni " +PACKAGES:prepend = "${PN}-cni " -FILES_${PN}-cni = "${sysconfdir}/cni/net.d/*" +FILES:${PN}-cni = "${sysconfdir}/cni/net.d/*" -RDEPENDS_${PN}-cni = "cni" +RDEPENDS:${PN}-cni = "cni" -do_install_append() { +do_install:append() { if [ -z "${CNI_NETWORKING_FILES}" ]; then bbfatal "cni-networking was inherited, but no networking configuration was provided via CNI_NETWORKING_FILES" fi diff --git a/classes/image-oci-sloci-image.inc b/classes/image-oci-sloci-image.inc index 36d3c2da..7aef3ae4 100644 --- a/classes/image-oci-sloci-image.inc +++ b/classes/image-oci-sloci-image.inc @@ -1,4 +1,4 @@ -IMAGE_CMD_oci() { +IMAGE_CMD:oci() { sloci_options="" bbdebug 1 "OCI image settings:" diff --git a/classes/image-oci-umoci.inc b/classes/image-oci-umoci.inc index b622714e..4fe96ea0 100644 --- a/classes/image-oci-umoci.inc +++ b/classes/image-oci-umoci.inc @@ -1,4 +1,4 @@ -IMAGE_CMD_oci() { +IMAGE_CMD:oci() { umoci_options="" bbdebug 1 "UMOCI image settings:" diff --git a/classes/image-oci.bbclass b/classes/image-oci.bbclass index 464ea3b4..d486de67 100644 --- a/classes/image-oci.bbclass +++ b/classes/image-oci.bbclass @@ -88,7 +88,7 @@ def oci_map_subarch(a, f, d): return '' return '' -# the IMAGE_CMD_oci comes from the .inc +# the IMAGE_CMD:oci comes from the .inc OCI_IMAGE_BACKEND_INC ?= "${@"image-oci-" + "${OCI_IMAGE_BACKEND}" + ".inc"}" include ${OCI_IMAGE_BACKEND_INC} -- cgit v1.2.3-54-g00ecf