diff options
Diffstat (limited to 'meta/recipes-core/meta')
-rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 21 | ||||
-rw-r--r-- | meta/recipes-core/meta/dummy-sdk-package.inc | 10 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-environment-extsdk.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 9 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-go-toolchain.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/meta/meta-ide-support.bb | 8 | ||||
-rw-r--r-- | meta/recipes-core/meta/signing-keys.bb | 6 | ||||
-rw-r--r-- | meta/recipes-core/meta/target-sdk-provides-dummy.bb | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/testexport-tarball.bb | 7 | ||||
-rw-r--r-- | meta/recipes-core/meta/uninative-tarball.bb | 1 | ||||
-rw-r--r-- | meta/recipes-core/meta/wic-tools.bb | 8 |
11 files changed, 50 insertions, 28 deletions
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index b5dae176bf..60f6aac837 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -49,7 +49,6 @@ RDEPENDS = "${TOOLCHAIN_HOST_TASK}" EXCLUDE_FROM_WORLD = "1" -inherit meta inherit populate_sdk inherit toolchain-scripts-base inherit nopackages @@ -61,7 +60,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" REAL_MULTIMACH_TARGET_SYS = "none" -create_sdk_files_append () { +create_sdk_files:append () { rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* @@ -89,8 +88,8 @@ EOF if [ "${SDKMACHINE}" = "i686" ]; then echo 'export NO32LIBS="0"' >>$script - echo 'echo "$BB_ENV_EXTRAWHITE" | grep -q "NO32LIBS"' >>$script - echo '[ $? != 0 ] && export BB_ENV_EXTRAWHITE="NO32LIBS $BB_ENV_EXTRAWHITE"' >>$script + echo 'echo "$BB_ENV_PASSTHROUGH_ADDITIONS" | grep -q "NO32LIBS"' >>$script + echo '[ $? != 0 ] && export BB_ENV_PASSTHROUGH_ADDITIONS="NO32LIBS $BB_ENV_PASSTHROUGH_ADDITIONS"' >>$script fi } @@ -99,3 +98,17 @@ TOOLCHAIN_NEED_CONFIGSITE_CACHE = "" # The recipe doesn't need any default deps INHIBIT_DEFAULT_DEPS = "1" + +python do_testsdk() { + import oeqa.sdk.testsdk + testsdk = oeqa.sdk.testsdk.TestSDK() + + cases_path = os.path.join(os.path.abspath(os.path.dirname(oeqa.sdk.testsdk.__file__)), "buildtools-cases") + testsdk.context_executor_class.default_cases = cases_path + + testsdk.run(d) +} +addtask testsdk +do_testsdk[nostamp] = "1" +do_testsdk[network] = "1" +do_testsdk[depends] += "xz-native:do_populate_sysroot" 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() { d.setVar('PACKAGE_ARCH', '${DUMMYARCH}') } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PR[vardeps] += "DUMMYPROVIDES" PR[vardeps] += "DUMMYPROVIDES_PACKAGES" @@ -22,10 +22,10 @@ DUMMYPROVIDES_PACKAGES ??= "" DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}" -python populate_packages_prepend() { +python populate_packages:prepend() { p = d.getVar("PN") - d.appendVar("RPROVIDES_%s" % p, "${DUMMYPROVIDES}") - d.appendVar("RCONFLICTS_%s" % p, "${DUMMYPROVIDES}") - d.appendVar("RREPLACES_%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") + d.appendVar("RPROVIDES:%s" % p, "${DUMMYPROVIDES}") + d.appendVar("RCONFLICTS:%s" % p, "${DUMMYPROVIDES}") + d.appendVar("RREPLACES:%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") } 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 PN = "meta-environment-extsdk-${MACHINE}" -create_sdk_files_append() { +create_sdk_files:append() { local sysroot=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${MACHINE} local sdkpathnative=${SDKPATH}/tmp/${@os.path.relpath(d.getVar('STAGING_DIR'), d.getVar('TMPDIR'))}/${BUILD_ARCH} diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index da1230bead..7118fb2aef 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -9,7 +9,7 @@ MODIFYTOS = "0" REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" inherit toolchain-scripts -TOOLCHAIN_NEED_CONFIGSITE_CACHE_append = " zlib" +TOOLCHAIN_NEED_CONFIGSITE_CACHE:append = " zlib" # Need to expand here before cross-candian changes HOST_ARCH -> SDK_ARCH TOOLCHAIN_CONFIGSITE_NOCACHE := "${TOOLCHAIN_CONFIGSITE_NOCACHE}" @@ -47,6 +47,11 @@ python do_generate_content() { } addtask generate_content before do_install after do_compile +python () { + sitefiles, searched = siteinfo_get_files(d, sysrootcache=False) + d.appendVarFlag("do_generate_content", "file-checksums", " " + " ".join(searched)) +} + create_sdk_files() { # Setup site file for external use toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} @@ -66,7 +71,7 @@ do_install() { PN = "meta-environment-${MACHINE}" PACKAGES = "${PN}" -FILES_${PN}= " \ +FILES:${PN}= " \ ${SDKPATH}/* \ " 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" inherit populate_sdk -TOOLCHAIN_HOST_TASK_append = " \ +TOOLCHAIN_HOST_TASK:append = " \ packagegroup-go-cross-canadian-${MACHINE} \ " -TOOLCHAIN_TARGET_TASK_append = " \ +TOOLCHAIN_TARGET_TASK:append = " \ ${@multilib_pkg_extend(d, 'packagegroup-go-sdk-target')} \ " diff --git a/meta/recipes-core/meta/meta-ide-support.bb b/meta/recipes-core/meta/meta-ide-support.bb index 768f6f4bb6..39317d50e0 100644 --- a/meta/recipes-core/meta/meta-ide-support.bb +++ b/meta/recipes-core/meta/meta-ide-support.bb @@ -6,10 +6,16 @@ DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native PR = "r3" RM_WORK_EXCLUDE += "${PN}" -inherit meta toolchain-scripts nopackages +inherit toolchain-scripts nopackages do_populate_ide_support () { toolchain_create_tree_env_script } +python () { + sitefiles, searched = siteinfo_get_files(d, sysrootcache=False) + d.setVar("CONFIG_SITE", " ".join(sitefiles)) + d.appendVarFlag("do_populate_ide_support", "file-checksums", " " + " ".join(searched)) +} + addtask populate_ide_support before do_build after do_install 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" PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed" -FILES_${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" -FILES_${PN}-ipk = "${sysconfdir}/pki/ipk-gpg" -FILES_${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg" +FILES:${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" +FILES:${PN}-ipk = "${sysconfdir}/pki/ipk-gpg" +FILES:${PN}-packagefeed = "${sysconfdir}/pki/packagefeed-gpg" python do_get_public_keys () { from oe.gpg_sign import get_signer diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb index e3beeb796c..849407cca5 100644 --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb +++ b/meta/recipes-core/meta/target-sdk-provides-dummy.bb @@ -58,4 +58,4 @@ DUMMYPROVIDES = "\ require dummy-sdk-package.inc -SSTATE_DUPWHITELIST += "${PKGDATA_DIR}/${PN} ${PKGDATA_DIR}/runtime/${PN}" +SSTATE_ALLOW_OVERLAP_FILES += "${PKGDATA_DIR}/${PN} ${PKGDATA_DIR}/runtime/${PN}" diff --git a/meta/recipes-core/meta/testexport-tarball.bb b/meta/recipes-core/meta/testexport-tarball.bb index daedd78cb4..bb9f8ded48 100644 --- a/meta/recipes-core/meta/testexport-tarball.bb +++ b/meta/recipes-core/meta/testexport-tarball.bb @@ -26,7 +26,6 @@ RDEPENDS = "${TOOLCHAIN_HOST_TASK}" EXCLUDE_FROM_WORLD = "1" -inherit meta inherit populate_sdk inherit toolchain-scripts-base inherit nopackages @@ -38,7 +37,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" REAL_MULTIMACH_TARGET_SYS = "none" -create_sdk_files_append () { +create_sdk_files:append () { rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* @@ -58,8 +57,8 @@ create_sdk_files_append () { if [ "${SDKMACHINE}" = "i686" ]; then echo 'export NO32LIBS="0"' >>$script - echo 'echo "$BB_ENV_EXTRAWHITE" | grep -q "NO32LIBS"' >>$script - echo '[ $? != 0 ] && export BB_ENV_EXTRAWHITE="NO32LIBS $BB_ENV_EXTRAWHITE"' >>$script + echo 'echo "$BB_ENV_PASSTHROUGH_ADDITIONS" | grep -q "NO32LIBS"' >>$script + echo '[ $? != 0 ] && export BB_ENV_PASSTHROUGH_ADDITIONS="NO32LIBS $BB_ENV_PASSTHROUGH_ADDITIONS"' >>$script fi } diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb index bbdaebad94..a21d08b591 100644 --- a/meta/recipes-core/meta/uninative-tarball.bb +++ b/meta/recipes-core/meta/uninative-tarball.bb @@ -36,7 +36,6 @@ RDEPENDS = "${TOOLCHAIN_HOST_TASK}" EXCLUDE_FROM_WORLD = "1" -inherit meta inherit populate_sdk inherit nopackages 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 = "\ btrfs-tools-native squashfs-tools-native pseudo-native \ e2fsprogs-native util-linux-native tar-native\ " -DEPENDS_append_x86 = " syslinux-native syslinux grub-efi systemd-boot" -DEPENDS_append_x86-64 = " syslinux-native syslinux grub-efi systemd-boot" -DEPENDS_append_x86-x32 = " syslinux-native syslinux grub-efi" -DEPENDS_append_aarch64 = " grub-efi systemd-boot" +DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot" +DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot" +DEPENDS:append:x86-x32 = " syslinux-native syslinux grub-efi" +DEPENDS:append:aarch64 = " grub-efi systemd-boot" INHIBIT_DEFAULT_DEPS = "1" |