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 <richard.purdie@linuxfoundation.org>
    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 <richard.purdie@linuxfoundation.org>

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

16 files changed, 38 insertions, 38 deletions

diff --git a/recipes-core/bind/bind_virtualization.inc b/recipes-core/bind/bind_virtualization.inc
index b8f0b3ff..dc63b2aa 100644
--- a/recipes-core/bind/bind_virtualization.inc
+++ b/recipes-core/bind/bind_virtualization.inc
@@ -1,4 +1,4 @@
 # Tell named not to bother listening on the IP address that lxc handles itself.
-do_install_append() {
+do_install:append() {
         sed -i -e 's,^\( *options *{\)$,\1\n\t// lxc would take care of this address itself\n\tlisten-on { ! 10.0.3.1; any;};\n,' ${D}${sysconfdir}/bind/named.conf.options
 }
diff --git a/recipes-core/busybox/busybox-initrd_1.33.1.bb b/recipes-core/busybox/busybox-initrd_1.33.1.bb
index 5ce5fa52..6108e9af 100644
--- a/recipes-core/busybox/busybox-initrd_1.33.1.bb
+++ b/recipes-core/busybox/busybox-initrd_1.33.1.bb
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:"
 
 require recipes-core/busybox/busybox_${PV}.bb
 
@@ -18,4 +18,4 @@ SECURITY_STRINGFORMAT = ""
 SYSROOT_DIRS += "/bin"
 BUSYBOX_SPLIT_SUID = "0"
 
-FILES_${PN} += "${sysconfdir}/init.d/*"
+FILES:${PN} += "${sysconfdir}/init.d/*"
diff --git a/recipes-core/busybox/busybox_virtualization.inc b/recipes-core/busybox/busybox_virtualization.inc
index 15f19308..652f389d 100644
--- a/recipes-core/busybox/busybox_virtualization.inc
+++ b/recipes-core/busybox/busybox_virtualization.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/busybox:"
 
 SRC_URI += " \
             file://lspci.cfg \
diff --git a/recipes-core/busybox/busybox_vmsep.inc b/recipes-core/busybox/busybox_vmsep.inc
index d4b1e6cc..566cd6d5 100644
--- a/recipes-core/busybox/busybox_vmsep.inc
+++ b/recipes-core/busybox/busybox_vmsep.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/busybox:"
 SRC_URI += " \
             file://static.cfg \
            "
diff --git a/recipes-core/initscripts/initscripts_virtualization.inc b/recipes-core/initscripts/initscripts_virtualization.inc
index 0600ab2a..db9c5535 100644
--- a/recipes-core/initscripts/initscripts_virtualization.inc
+++ b/recipes-core/initscripts/initscripts_virtualization.inc
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
 
         echo                  >> ${D}${sysconfdir}/init.d/functions
         echo success \(\) \{  >> ${D}${sysconfdir}/init.d/functions
diff --git a/recipes-core/kata-containers/kata-agent_git.bb b/recipes-core/kata-containers/kata-agent_git.bb
index 3632ee52..e154321e 100644
--- a/recipes-core/kata-containers/kata-agent_git.bb
+++ b/recipes-core/kata-containers/kata-agent_git.bb
@@ -8,7 +8,7 @@ SRCREV = "e03f7d7453fabffb17e1540f28666c26178d3cbf"
 SRC_URI = "git://${GO_IMPORT}.git \
           "
 
-RDEPENDS_${PN}-dev_append = "bash"
+RDEPENDS:${PN}-dev:append = "bash"
 
 S = "${WORKDIR}/git"
 
@@ -36,4 +36,4 @@ do_install() {
 
 deltask compile_ptest_base
 
-FILES_${PN} += "${systemd_unitdir}/*"
\ No newline at end of file
+FILES:${PN} += "${systemd_unitdir}/*"
\ No newline at end of file
diff --git a/recipes-core/kata-containers/kata-proxy_git.bb b/recipes-core/kata-containers/kata-proxy_git.bb
index 8de0bfcf..7e31355e 100644
--- a/recipes-core/kata-containers/kata-proxy_git.bb
+++ b/recipes-core/kata-containers/kata-proxy_git.bb
@@ -8,7 +8,7 @@ SRCREV = "1148847739f9a9f47b92e34e4f309dc109d4dba9"
 SRC_URI = "git://${GO_IMPORT}.git \
           "
 
-RDEPENDS_${PN}-dev_append = "bash"
+RDEPENDS:${PN}-dev:append = "bash"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-core/kata-containers/kata-runtime_git.bb b/recipes-core/kata-containers/kata-runtime_git.bb
index 403d552e..79ab87e4 100644
--- a/recipes-core/kata-containers/kata-runtime_git.bb
+++ b/recipes-core/kata-containers/kata-runtime_git.bb
@@ -8,11 +8,11 @@ SRCREV = "04c77eb20e9bd603cab5c711bcbe7c69db58b040"
 SRC_URI = "git://${GO_IMPORT}.git \
            file://0001-makefile-allow-SKIP_GO_VERSION_CHECK-to-be-overriden.patch \
           "
-RDEPENDS_${PN}-dev_append = "bash"
+RDEPENDS:${PN}-dev:append = "bash"
 
 CONTAINER_KERNEL ?= ""
 CONTAINER_INITRD ?= ""
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
                  qemu \
                  ${CONTAINER_KERNEL} \
                  ${CONTAINER_INITRD} \
@@ -55,6 +55,6 @@ do_install() {
         # fork/exec /usr/libexec/kata-containers/kata-proxy: no such file or directory
 }
 
-FILES_${PN} += "${datadir}/defaults/kata-containers/*"
+FILES:${PN} += "${datadir}/defaults/kata-containers/*"
 
 deltask compile_ptest_base
diff --git a/recipes-core/kata-containers/kata-shim_git.bb b/recipes-core/kata-containers/kata-shim_git.bb
index fb55a8e7..a0e965ec 100644
--- a/recipes-core/kata-containers/kata-shim_git.bb
+++ b/recipes-core/kata-containers/kata-shim_git.bb
@@ -8,7 +8,7 @@ SRCREV = "bcc35aeca3ef6fa0976005c9e93525906aefed2f"
 SRC_URI = "git://${GO_IMPORT}.git \
           "
 
-RDEPENDS_${PN}-dev_append = "bash"
+RDEPENDS:${PN}-dev:append = "bash"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-core/libxcrypt/libxcrypt_%.bbappend b/recipes-core/libxcrypt/libxcrypt_%.bbappend
index 0b4fbb3d..55e453d9 100644
--- a/recipes-core/libxcrypt/libxcrypt_%.bbappend
+++ b/recipes-core/libxcrypt/libxcrypt_%.bbappend
@@ -1,4 +1,4 @@
 # if vmsep is in distro features, we need a static libxycryp, so we can build
 # a static busybox. The end result of this is:
-#    EXTRA_OECONF_remove = "--disable-static"
-EXTRA_OECONF_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', '--disable-static', '', d)}"
+#    EXTRA_OECONF:remove = "--disable-static"
+EXTRA_OECONF:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', '--disable-static', '', d)}"
diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
index 89b9c01c..82d4a2e7 100644
--- a/recipes-core/packagegroups/packagegroup-container.bb
+++ b/recipes-core/packagegroups/packagegroup-container.bb
@@ -16,32 +16,32 @@ PACKAGES = "\
 
 # everything and the kitchen sink, used for building/installing
 # many things at once.
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     packagegroup-lxc \
     packagegroup-docker \
     packagegroup-oci \
 "
 
-RDEPENDS_packagegroup-lxc = " \
+RDEPENDS:packagegroup-lxc = " \
     lxc \
 "
 
-RDEPENDS_packagegroup-docker = " \
+RDEPENDS:packagegroup-docker = " \
     docker \
 "
 
-RDEPENDS_packagegroup-podman = " \
+RDEPENDS:packagegroup-podman = " \
     podman \
 "
 
-RDEPENDS_packagegroup-oci = " \
+RDEPENDS:packagegroup-oci = " \
     virtual/runc \
     oci-systemd-hook \
     oci-runtime-tools \
     oci-image-tools \
 "
 
-RDEPENDS_packagegroup-containerd = " \
+RDEPENDS:packagegroup-containerd = " \
     virtual/containerd \
 "
 
diff --git a/recipes-core/packagegroups/packagegroup-kubernetes.bb b/recipes-core/packagegroups/packagegroup-kubernetes.bb
index 237e72e8..8bfe942e 100644
--- a/recipes-core/packagegroups/packagegroup-kubernetes.bb
+++ b/recipes-core/packagegroups/packagegroup-kubernetes.bb
@@ -18,26 +18,26 @@ PACKAGES = "\
 
 KUBERNETES_CRI ?= "containerd"
 
-RDEPENDS_packagegroup-kubernetes-base = " \
+RDEPENDS:packagegroup-kubernetes-base = " \
     packagegroup-${KUBERNETES_CRI} \
     packagegroup-oci \
 "
 
-RDEPENDS_packagegroup-k8s-host = " \
+RDEPENDS:packagegroup-k8s-host = " \
     packagegroup-kubernetes-base \
 "
 
-RDEPENDS_packagegroup-k8s-node = " \
+RDEPENDS:packagegroup-k8s-node = " \
     packagegroup-kubernetes-base \
 "
 
-RDEPENDS_packagegroup-k3s-host = " \
+RDEPENDS:packagegroup-k3s-host = " \
     packagegroup-kubernetes-base \
     k3s-server \
     k3s-cni \
 "
 
-RDEPENDS_packagegroup-k3s-node = " \
+RDEPENDS:packagegroup-k3s-node = " \
     packagegroup-kubernetes-base \
     k3s-agent \
     k3s-cni \
diff --git a/recipes-core/runv/runv_git.bb b/recipes-core/runv/runv_git.bb
index ef94f096..af19de81 100644
--- a/recipes-core/runv/runv_git.bb
+++ b/recipes-core/runv/runv_git.bb
@@ -22,7 +22,7 @@ inherit autotools-brokensep
 PACKAGECONFIG[xen] = "--with-xen,--without-xen,"
 AUTOTOOLS_SCRIPT_PATH = "${S}/src/import/"
 
-RDEPENDS_${PN} += " qemu hyperstart"
+RDEPENDS:${PN} += " qemu hyperstart"
 
 do_compile() {
         export GOARCH="${TARGET_GOARCH}"
@@ -76,6 +76,6 @@ do_install() {
 
 deltask compile_ptest_base
 
-FILES_${PN} += "/usr/local/bin/*"
+FILES:${PN} += "/usr/local/bin/*"
 
-INSANE_SKIP_${PN} += "ldflags already-stripped"
+INSANE_SKIP:${PN} += "ldflags already-stripped"
diff --git a/recipes-core/runx/runx_git.bb b/recipes-core/runx/runx_git.bb
index 89783a0e..7c9232b8 100644
--- a/recipes-core/runx/runx_git.bb
+++ b/recipes-core/runx/runx_git.bb
@@ -41,9 +41,9 @@ DEPENDS += "openssl-native coreutils-native util-linux-native xz-native bc-nativ
 DEPENDS += "elfutils-native"
 DEPENDS += "qemu-native bison-native"
 
-RDEPENDS_${PN} += " jq bash"
-RDEPENDS_${PN} += " xen-tools-xl go-build socat daemonize"
-RDEPENDS_${PN} += " qemu-system-i386 ca-certificates qemu qemu-keymaps"
+RDEPENDS:${PN} += " jq bash"
+RDEPENDS:${PN} += " xen-tools-xl go-build socat daemonize"
+RDEPENDS:${PN} += " qemu-system-i386 ca-certificates qemu qemu-keymaps"
 
 RUNX_USE_INTERNAL_BUSYBOX ?= ""
 
@@ -120,7 +120,7 @@ do_install() {
 
 deltask compile_ptest_base
 
-FILES_${PN} += "${bindir}/* ${datadir}/runX/*"
+FILES:${PN} += "${bindir}/* ${datadir}/runX/*"
 
 INHIBIT_PACKAGE_STRIP = "1"
-INSANE_SKIP_${PN} += "ldflags already-stripped"
+INSANE_SKIP:${PN} += "ldflags already-stripped"
diff --git a/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc b/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
index 9e796efd..bf52da0e 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
+++ b/recipes-core/sysvinit/sysvinit-inittab_virtualization.inc
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 SRC_URI += "file://getty-wrapper"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${base_sbindir}
     install -m 0755 ${WORKDIR}/getty-wrapper ${D}${base_sbindir}/getty-wrapper
 }
-FILES_${PN} += "${base_sbindir}/getty-wrapper"
+FILES:${PN} += "${base_sbindir}/getty-wrapper"
diff --git a/recipes-core/sysvinit/sysvinit-inittab_xen.inc b/recipes-core/sysvinit/sysvinit-inittab_xen.inc
index de0af20b..7f92bd1f 100644
--- a/recipes-core/sysvinit/sysvinit-inittab_xen.inc
+++ b/recipes-core/sysvinit/sysvinit-inittab_xen.inc
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
                 echo "" >> ${D}${sysconfdir}/inittab
                 echo "X0:12345:respawn:${base_sbindir}/getty-wrapper 115200 hvc0" >> ${D}${sysconfdir}/inittab
 }