summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core/meta
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/meta')
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb2
-rw-r--r--meta/recipes-core/meta/dummy-sdk-package.inc10
-rw-r--r--meta/recipes-core/meta/meta-environment-extsdk.bb2
-rw-r--r--meta/recipes-core/meta/meta-environment.bb4
-rw-r--r--meta/recipes-core/meta/meta-go-toolchain.bb4
-rw-r--r--meta/recipes-core/meta/signing-keys.bb6
-rw-r--r--meta/recipes-core/meta/testexport-tarball.bb2
-rw-r--r--meta/recipes-core/meta/wic-tools.bb8
8 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index b5dae176bf..9775430d4b 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -61,7 +61,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
61 61
62REAL_MULTIMACH_TARGET_SYS = "none" 62REAL_MULTIMACH_TARGET_SYS = "none"
63 63
64create_sdk_files_append () { 64create_sdk_files:append () {
65 rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* 65 rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
66 rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* 66 rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
67 rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* 67 rm -f ${SDK_OUTPUT}/${SDKPATH}/version-*
diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc
index bedde2965c..bd26e39ad3 100644
--- a/meta/recipes-core/meta/dummy-sdk-package.inc
+++ b/meta/recipes-core/meta/dummy-sdk-package.inc
@@ -13,7 +13,7 @@ python() {
13 d.setVar('PACKAGE_ARCH', '${DUMMYARCH}') 13 d.setVar('PACKAGE_ARCH', '${DUMMYARCH}')
14} 14}
15 15
16ALLOW_EMPTY_${PN} = "1" 16ALLOW_EMPTY:${PN} = "1"
17 17
18PR[vardeps] += "DUMMYPROVIDES" 18PR[vardeps] += "DUMMYPROVIDES"
19PR[vardeps] += "DUMMYPROVIDES_PACKAGES" 19PR[vardeps] += "DUMMYPROVIDES_PACKAGES"
@@ -22,10 +22,10 @@ DUMMYPROVIDES_PACKAGES ??= ""
22DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" 22DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}"
23DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}" 23DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}"
24 24
25python populate_packages_prepend() { 25python populate_packages:prepend() {
26 p = d.getVar("PN") 26 p = d.getVar("PN")
27 d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") 27 d.appendVar("RPROVIDES:%s" % p, "${DUMMYPROVIDES}")
28 d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") 28 d.appendVar("RCONFLICTS:%s" % p, "${DUMMYPROVIDES}")
29 d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") 29 d.appendVar("RREPLACES:%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}")
30} 30}
31 31
diff --git a/meta/recipes-core/meta/meta-environment-extsdk.bb b/meta/recipes-core/meta/meta-environment-extsdk.bb
index 2076b56f25..706312b0d6 100644
--- a/meta/recipes-core/meta/meta-environment-extsdk.bb
+++ b/meta/recipes-core/meta/meta-environment-extsdk.bb
@@ -4,7 +4,7 @@ require meta-environment.bb
4 4
5PN = "meta-environment-extsdk-${MACHINE}" 5PN = "meta-environment-extsdk-${MACHINE}"
6 6
7create_sdk_files_append() { 7create_sdk_files:append() {
8 local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${MACHINE} 8 local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${MACHINE}
9 local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${BUILD_ARCH} 9 local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${BUILD_ARCH}
10 10
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index da1230bead..27f0103665 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -9,7 +9,7 @@ MODIFYTOS = "0"
9REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" 9REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
10 10
11inherit toolchain-scripts 11inherit toolchain-scripts
12TOOLCHAIN_NEED_CONFIGSITE_CACHE_append = " zlib" 12TOOLCHAIN_NEED_CONFIGSITE_CACHE:append = " zlib"
13# Need to expand here before cross-candian changes HOST_ARCH -> SDK_ARCH 13# Need to expand here before cross-candian changes HOST_ARCH -> SDK_ARCH
14TOOLCHAIN_CONFIGSITE_NOCACHE := "${TOOLCHAIN_CONFIGSITE_NOCACHE}" 14TOOLCHAIN_CONFIGSITE_NOCACHE := "${TOOLCHAIN_CONFIGSITE_NOCACHE}"
15 15
@@ -66,7 +66,7 @@ do_install() {
66 66
67PN = "meta-environment-${MACHINE}" 67PN = "meta-environment-${MACHINE}"
68PACKAGES = "${PN}" 68PACKAGES = "${PN}"
69FILES_${PN}= " \ 69FILES:${PN}= " \
70 ${SDKPATH}/* \ 70 ${SDKPATH}/* \
71 " 71 "
72 72
diff --git a/meta/recipes-core/meta/meta-go-toolchain.bb b/meta/recipes-core/meta/meta-go-toolchain.bb
index dde385c1b1..c24518efe3 100644
--- a/meta/recipes-core/meta/meta-go-toolchain.bb
+++ b/meta/recipes-core/meta/meta-go-toolchain.bb
@@ -3,10 +3,10 @@ LICENSE = "MIT"
3 3
4inherit populate_sdk 4inherit populate_sdk
5 5
6TOOLCHAIN_HOST_TASK_append = " \ 6TOOLCHAIN_HOST_TASK:append = " \
7 packagegroup-go-cross-canadian-${MACHINE} \ 7 packagegroup-go-cross-canadian-${MACHINE} \
8" 8"
9 9
10TOOLCHAIN_TARGET_TASK_append = " \ 10TOOLCHAIN_TARGET_TASK:append = " \
11 ${@multilib_pkg_extend(d, 'packagegroup-go-sdk-target')} \ 11 ${@multilib_pkg_extend(d, 'packagegroup-go-sdk-target')} \
12" 12"
diff --git a/meta/recipes-core/meta/signing-keys.bb b/meta/recipes-core/meta/signing-keys.bb
index 5bab94aa36..03463f95f5 100644
--- a/meta/recipes-core/meta/signing-keys.bb
+++ b/meta/recipes-core/meta/signing-keys.bb
@@ -14,9 +14,9 @@ SYSROOT_DIRS += "${sysconfdir}/pki"
14 14
15PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed" 15PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed"
16 16
17FILES_${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" 17FILES:${PN}-rpm = "${sysconfdir}/pki/rpm-gpg"
18FILES_${PN}-ipk = "${sysconfdir}/pki/ipk-gpg" 18FILES:${PN}-ipk = "${sysconfdir}/pki/ipk-gpg"
19FILES_${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg" 19FILES:${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg"
20 20
21python do_get_public_keys () { 21python do_get_public_keys () {
22 from oe.gpg_sign import get_signer 22 from oe.gpg_sign import get_signer
diff --git a/meta/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb
index daedd78cb4..de7663b38c 100644
--- a/meta/recipes-core/meta/testexport-tarball.bb
+++ b/meta/recipes-core/meta/testexport-tarball.bb
@@ -38,7 +38,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
38 38
39REAL_MULTIMACH_TARGET_SYS = "none" 39REAL_MULTIMACH_TARGET_SYS = "none"
40 40
41create_sdk_files_append () { 41create_sdk_files:append () {
42 rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* 42 rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
43 rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* 43 rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
44 rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* 44 rm -f ${SDK_OUTPUT}/${SDKPATH}/version-*
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
index bc6cc0d183..ba0916cb56 100644
--- a/meta/recipes-core/meta/wic-tools.bb
+++ b/meta/recipes-core/meta/wic-tools.bb
@@ -8,10 +8,10 @@ DEPENDS = "\
8 btrfs-tools-native squashfs-tools-native pseudo-native \ 8 btrfs-tools-native squashfs-tools-native pseudo-native \
9 e2fsprogs-native util-linux-native tar-native\ 9 e2fsprogs-native util-linux-native tar-native\
10 " 10 "
11DEPENDS_append_x86 = " syslinux-native syslinux grub-efi systemd-boot" 11DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot"
12DEPENDS_append_x86-64 = " syslinux-native syslinux grub-efi systemd-boot" 12DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot"
13DEPENDS_append_x86-x32 = " syslinux-native syslinux grub-efi" 13DEPENDS:append:x86-x32 = " syslinux-native syslinux grub-efi"
14DEPENDS_append_aarch64 = " grub-efi systemd-boot" 14DEPENDS:append:aarch64 = " grub-efi systemd-boot"
15 15
16INHIBIT_DEFAULT_DEPS = "1" 16INHIBIT_DEFAULT_DEPS = "1"
17 17