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>

1 files changed, 11 insertions, 11 deletions

diff --git a/recipes-extended/ceph/ceph_15.2.12.bb b/recipes-extended/ceph/ceph_15.2.12.bb
index 3c2e1c62..6636d7a4 100644
--- a/recipes-extended/ceph/ceph_15.2.12.bb
+++ b/recipes-extended/ceph/ceph_15.2.12.bb
@@ -29,7 +29,7 @@ DEPENDS = "boost bzip2 curl expat gperf-native \
            python3 python3-cython-native rabbitmq-c rocksdb snappy udev \
            valgrind xfsprogs zlib \
 "
-SYSTEMD_SERVICE_${PN} = " \
+SYSTEMD_SERVICE:${PN} = " \
         ceph-radosgw@.service \
         ceph-radosgw.target \
         ceph-mon@.service \
@@ -72,13 +72,13 @@ EXTRA_OECMAKE = "-DWITH_MANPAGE=OFF \
 
 export STAGING_DIR_HOST
 
-do_configure_prepend () {
+do_configure:prepend () {
         echo "set( CMAKE_SYSROOT \"${RECIPE_SYSROOT}\" )" >> ${WORKDIR}/toolchain.cmake
         echo "set( CMAKE_DESTDIR \"${D}\" )" >> ${WORKDIR}/toolchain.cmake
         echo "set( PYTHON_SITEPACKAGES_DIR \"${PYTHON_SITEPACKAGES_DIR}\" )" >> ${WORKDIR}/toolchain.cmake
 }
 
-do_install_append () {
+do_install:append () {
         sed -i -e 's:^#!/usr/bin/python$:&3:' \
                 -e 's:${WORKDIR}.*python3:${bindir}/python3:' \
                 ${D}${bindir}/ceph ${D}${bindir}/ceph-crash \
@@ -94,7 +94,7 @@ do_install_append () {
         rm ${D}${systemd_unitdir}/system/ceph-fuse.target ${D}${systemd_unitdir}/system/ceph-fuse@.service
 }
 
-do_install_append_class-target () {
+do_install:append:class-target () {
         if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
                 install -d ${D}${sysconfdir}/tmpfiles.d
                 echo "d /var/lib/ceph/crash/posted 0755 root root - -" > ${D}${sysconfdir}/tmpfiles.d/ceph-placeholder.conf
@@ -106,28 +106,28 @@ do_install_append_class-target () {
         fi
 }
 
-pkg_postinst_${PN}() {
+pkg_postinst:${PN}() {
         if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then
                 ${sysconfdir}/init.d/populate-volatile.sh update
         fi
 }
 
-FILES_${PN} += "\
+FILES:${PN} += "\
                 ${libdir}/rados-classes/*.so.* \
                 ${libdir}/ceph/compressor/*.so \
                 ${libdir}/rados-classes/*.so \
                 ${libdir}/ceph/*.so \
 "
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     /etc/tmpfiles.d/ceph-placeholder.conf \
     /etc/default/volatiles/99_ceph-placeholder \
 "
 
-FILES_${PN}-python = "\
+FILES:${PN}-python = "\
                 ${PYTHON_SITEPACKAGES_DIR}/* \
 "
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
                 python3-core \
                 python3-misc \
                 python3-modules \
@@ -138,8 +138,8 @@ COMPATIBLE_HOST = "(x86_64).*"
 PACKAGES += " \
         ${PN}-python \
 "
-INSANE_SKIP_${PN}-python += "ldflags"
-INSANE_SKIP_${PN} += "dev-so"
+INSANE_SKIP:${PN}-python += "ldflags"
+INSANE_SKIP:${PN} += "dev-so"
 CCACHE_DISABLE = "1"
 
 CVE_PRODUCT = "ceph ceph_storage ceph_storage_mon ceph_storage_osd"