From 42344347be29f0997cc2f7636d9603b1fe1875ae Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Jul 2021 23:28:15 +0100 Subject: Convert to new override syntax This is the result of automated script conversion: scripts/contrib/convert-overrides.py converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Richard Purdie --- .../recipes-devtools/python/python-async-test.inc | 2 +- meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb | 20 ++++++++++---------- .../container-image/container-image-testpkg.bb | 2 +- .../recipes-test/devtool/devtool-patch-overrides.bb | 4 ++-- .../recipes-test/images/wic-image-minimal.bb | 6 +++--- .../multiconfig/multiconfig-image-packager_0.1.bb | 8 ++++---- meta-selftest/recipes-test/postinst/postinst_1.0.bb | 20 ++++++++++---------- .../recipetool/selftest-recipetool-appendfile.bb | 4 ++-- .../recipes-test/recipeutils/recipeutils-test_1.2.bb | 2 +- .../recipes-test/selftest-chown/selftest-chown.bb | 4 ++-- .../recipes-test/selftest-ed/selftest-ed_0.5.bb | 6 +++--- .../selftest-hardlink/selftest-hardlink.bb | 4 ++-- 12 files changed, 41 insertions(+), 41 deletions(-) (limited to 'meta-selftest') diff --git a/meta-selftest/recipes-devtools/python/python-async-test.inc b/meta-selftest/recipes-devtools/python/python-async-test.inc index c9602e8e52..439a0b9276 100644 --- a/meta-selftest/recipes-devtools/python/python-async-test.inc +++ b/meta-selftest/recipes-devtools/python/python-async-test.inc @@ -11,6 +11,6 @@ PYPI_PACKAGE = "async" SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b" SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051" -RDEPENDS_${PN} += "${PYTHON_PN}-threading" +RDEPENDS:${PN} += "${PYTHON_PN}-threading" BBCLASSEXTEND = "nativesdk" diff --git a/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb b/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb index dcf6c8ba63..d6f3628e60 100644 --- a/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb +++ b/meta-selftest/recipes-test/aspell/aspell_0.0.0.1.bb @@ -20,15 +20,15 @@ PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses" PACKAGES += "libaspell libpspell libpspell-dev aspell-utils" -FILES_${PN}-dbg += "${libdir}/aspell-0.60/.debu*" -FILES_libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*" -FILES_aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*" -FILES_${PN} = "${bindir}/aspell" -FILES_libpspell = "${libdir}/libpspell.so.*" -FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" - -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv6 = "arm" +FILES:${PN}-dbg += "${libdir}/aspell-0.60/.debu*" +FILES:libaspell = "${libdir}/libaspell.so.* ${libdir}/aspell*" +FILES:aspell-utils = "${bindir}/word-list-compress ${bindir}/aspell-import ${bindir}/run-with-aspell ${bindir}/pre*" +FILES:${PN} = "${bindir}/aspell" +FILES:libpspell = "${libdir}/libpspell.so.*" +FILES:libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell" + +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv6 = "arm" inherit autotools gettext diff --git a/meta-selftest/recipes-test/container-image/container-image-testpkg.bb b/meta-selftest/recipes-test/container-image/container-image-testpkg.bb index f8dd2290b3..929bc29753 100644 --- a/meta-selftest/recipes-test/container-image/container-image-testpkg.bb +++ b/meta-selftest/recipes-test/container-image/container-image-testpkg.bb @@ -2,7 +2,7 @@ LICENSE = "MIT" INHIBIT_DEFAULT_DEPS = "1" -do_install_append() { +do_install:append() { install -d ${D}${bindir} touch ${D}${bindir}/theapp } diff --git a/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb b/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb index d36c9edee4..f12bee0b3d 100644 --- a/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb +++ b/meta-selftest/recipes-test/devtool/devtool-patch-overrides.bb @@ -4,5 +4,5 @@ INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" SRC_URI = "file://source;subdir=${BP}" -SRC_URI_append_qemuarm = " file://arm.patch;striplevel=0" -SRC_URI_append_qemux86 = " file://x86.patch;striplevel=0" +SRC_URI:append:qemuarm = " file://arm.patch;striplevel=0" +SRC_URI:append:qemux86 = " file://x86.patch;striplevel=0" diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index 1cb019898d..84d3721885 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -7,9 +7,9 @@ IMAGE_INSTALL = "packagegroup-core-boot" IMAGE_FSTYPES = "wic" WKS_FILE_DEPENDS = "dosfstools-native mtools-native gptfdisk-native" -WKS_FILE_DEPENDS_append_x86 = " syslinux-native syslinux" -WKS_FILE_DEPENDS_append_x86-64 = " syslinux-native syslinux" -WKS_FILE_DEPENDS_append_x86-x32 = " syslinux-native syslinux" +WKS_FILE_DEPENDS:append:x86 = " syslinux-native syslinux" +WKS_FILE_DEPENDS:append:x86-64 = " syslinux-native syslinux" +WKS_FILE_DEPENDS:append:x86-x32 = " syslinux-native syslinux" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb index a76a6bea1b..daf2834958 100644 --- a/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb +++ b/meta-selftest/recipes-test/multiconfig/multiconfig-image-packager_0.1.bb @@ -1,10 +1,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -MCMACHINE_virtclass-mcextend-musl = "qemux86-64" -MCMACHINE_virtclass-mcextend-tiny = "qemux86" -MCIMGTYPE_virtclass-mcextend-musl = "ext4" -MCIMGTYPE_virtclass-mcextend-tiny = "cpio.gz" +MCMACHINE:virtclass-mcextend-musl = "qemux86-64" +MCMACHINE:virtclass-mcextend-tiny = "qemux86" +MCIMGTYPE:virtclass-mcextend-musl = "ext4" +MCIMGTYPE:virtclass-mcextend-tiny = "cpio.gz" MC_DEPLOY_DIR_IMAGE = "${TOPDIR}/tmp-mc-${MCNAME}/deploy/images/${MCMACHINE}" diff --git a/meta-selftest/recipes-test/postinst/postinst_1.0.bb b/meta-selftest/recipes-test/postinst/postinst_1.0.bb index 913bfabf89..b936c4f44b 100644 --- a/meta-selftest/recipes-test/postinst/postinst_1.0.bb +++ b/meta-selftest/recipes-test/postinst/postinst_1.0.bb @@ -5,19 +5,19 @@ inherit allarch PACKAGES = "${PN}-rootfs ${PN}-delayed-a ${PN}-delayed-b ${PN}-rootfs-failing" -ALLOW_EMPTY_${PN}-rootfs = "1" -ALLOW_EMPTY_${PN}-delayed-a = "1" -ALLOW_EMPTY_${PN}-delayed-b = "1" -ALLOW_EMPTY_${PN}-rootfs-failing = "1" +ALLOW_EMPTY:${PN}-rootfs = "1" +ALLOW_EMPTY:${PN}-delayed-a = "1" +ALLOW_EMPTY:${PN}-delayed-b = "1" +ALLOW_EMPTY:${PN}-rootfs-failing = "1" -RDEPENDS_${PN}-delayed-a = "${PN}-rootfs" -RDEPENDS_${PN}-delayed-b = "${PN}-delayed-a" +RDEPENDS:${PN}-delayed-a = "${PN}-rootfs" +RDEPENDS:${PN}-delayed-b = "${PN}-delayed-a" TESTDIR = "${sysconfdir}/postinst-test" # At rootfs time touch $TESTDIR/rootfs. Errors if the file already exists, or # if the function runs on first boot. -pkg_postinst_${PN}-rootfs () { +pkg_postinst:${PN}-rootfs () { set -e if [ -z "$D" ]; then @@ -36,7 +36,7 @@ pkg_postinst_${PN}-rootfs () { # Depends on rootfs, delays until first boot, verifies that the rootfs file was # written. -pkg_postinst_ontarget_${PN}-delayed-a () { +pkg_postinst_ontarget:${PN}-delayed-a () { set -e if [ ! -e ${TESTDIR}/rootfs ]; then @@ -49,7 +49,7 @@ pkg_postinst_ontarget_${PN}-delayed-a () { # Depends on delayed-a, delays until first boot, verifies that the delayed-a file was # written. This verifies the ordering between delayed postinsts. -pkg_postinst_ontarget_${PN}-delayed-b () { +pkg_postinst_ontarget:${PN}-delayed-b () { set -e if [ ! -e ${TESTDIR}/delayed-a ]; then @@ -62,7 +62,7 @@ pkg_postinst_ontarget_${PN}-delayed-b () { # This scriptlet intentionally includes a bogus command in the middle to test # that we catch and report such errors properly. -pkg_postinst_${PN}-rootfs-failing () { +pkg_postinst:${PN}-rootfs-failing () { mkdir -p $D${TESTDIR} touch $D${TESTDIR}/rootfs-before-failure run_a_really_broken_command diff --git a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb b/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb index b5f976708f..e127b48b15 100644 --- a/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb +++ b/meta-selftest/recipes-test/recipetool/selftest-recipetool-appendfile.bb @@ -34,9 +34,9 @@ do_install() { install_extrafunc } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { echo "Test file installed by postinst" > $D${datadir}/selftest-replaceme-postinst } -FILES_${PN} += "${datadir}" +FILES:${PN} += "${datadir}" diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb index 0cd0494da8..062d6a7a05 100644 --- a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb +++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb @@ -10,4 +10,4 @@ BBCLASSEXTEND = "native nativesdk" SRC_URI += "file://somefile" -SRC_URI_append = " file://anotherfile" +SRC_URI:append = " file://anotherfile" diff --git a/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb b/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb index 440471fe80..aa6ce0c2a0 100644 --- a/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb +++ b/meta-selftest/recipes-test/selftest-chown/selftest-chown.bb @@ -10,7 +10,7 @@ S = "${WORKDIR}" inherit useradd allarch USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-u 1234 -M test" +USERADD_PARAM:${PN} = "-u 1234 -M test" TESTDIR = "${D}${sysconfdir}/selftest-chown" do_install() { @@ -27,4 +27,4 @@ do_install() { chown -R test:test ${TESTDIR}/fifotest } -FILES_${PN} = "${sysconfdir}/selftest-chown/*" +FILES:${PN} = "${sysconfdir}/selftest-chown/*" diff --git a/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb b/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb index 4f713f5c0e..7595e8ef16 100644 --- a/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb +++ b/meta-selftest/recipes-test/selftest-ed/selftest-ed_0.5.bb @@ -17,8 +17,8 @@ S = "${WORKDIR}/ed-${PV}" EXTRA_OECONF = "'CC=${CC}' 'CXX=${CXX}' 'CFLAGS=${CFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}'" -CONFIGUREOPTS_remove = "--disable-dependency-tracking" -CONFIGUREOPTS_remove = "--disable-silent-rules" -EXTRA_OECONF_remove = "--disable-static" +CONFIGUREOPTS:remove = "--disable-dependency-tracking" +CONFIGUREOPTS:remove = "--disable-silent-rules" +EXTRA_OECONF:remove = "--disable-static" BBCLASSEXTEND = "native" diff --git a/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb b/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb index 842a9772cb..be346b8a0e 100644 --- a/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb +++ b/meta-selftest/recipes-test/selftest-hardlink/selftest-hardlink.bb @@ -25,6 +25,6 @@ do_install () { dd if=/dev/zero of=${D}${bindir}/sparsetest bs=1 count=0 seek=1M } -RDEPENDS_${PN}-gdb += "gdb" +RDEPENDS:${PN}-gdb += "gdb" PACKAGES =+ "${PN}-gdb" -FILES_${PN}-gdb = "${bindir}/gdb.sh" +FILES:${PN}-gdb = "${bindir}/gdb.sh" -- cgit 1.2.3-korg