diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/meta')
8 files changed, 130 insertions, 17 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/buildtools-tarball.bb b/import-layers/yocto-poky/meta/recipes-core/meta/buildtools-tarball.bb index e9578cac0..5808c95d8 100644 --- a/import-layers/yocto-poky/meta/recipes-core/meta/buildtools-tarball.bb +++ b/import-layers/yocto-poky/meta/recipes-core/meta/buildtools-tarball.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "SDK type target for building a standalone tarball containing python, chrpath, make, git and tar. The \ +DESCRIPTION = "SDK type target for building a standalone tarball containing python3, chrpath, make, git and tar. The \ tarball can be used to run bitbake builds on systems which don't meet the usual version requirements." SUMMARY = "Standalone tarball for running builds on systems with inadequate software" LICENSE = "MIT" @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d TOOLCHAIN_TARGET_TASK ?= "" TOOLCHAIN_HOST_TASK ?= "\ - nativesdk-python-core \ - nativesdk-python-modules \ - nativesdk-python-misc \ - nativesdk-python-git \ - nativesdk-python-pexpect \ + nativesdk-python3-core \ + nativesdk-python3-modules \ + nativesdk-python3-misc \ + nativesdk-python3-git \ nativesdk-ncurses-terminfo-base \ nativesdk-chrpath \ nativesdk-tar \ @@ -24,11 +23,18 @@ TOOLCHAIN_HOST_TASK ?= "\ nativesdk-wget \ nativesdk-ca-certificates \ nativesdk-texinfo \ + nativesdk-locale-base-en-us \ " +MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" +PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}" +PACKAGE_ARCHS = "" +TARGET_ARCH = "none" +TARGET_OS = "none" + SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" -TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" +TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" SDK_TITLE = "Build tools" @@ -38,7 +44,17 @@ EXCLUDE_FROM_WORLD = "1" inherit meta inherit populate_sdk -inherit toolchain-scripts +inherit toolchain-scripts-base +inherit nopackages + +deltask install +deltask package +deltask packagedata +deltask populate_sysroot + +do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" + +REAL_MULTIMACH_TARGET_SYS = "none" create_sdk_files_append () { rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-environment.bb b/import-layers/yocto-poky/meta/recipes-core/meta/meta-environment.bb index 49d45f6ec..d9e045f04 100644 --- a/import-layers/yocto-poky/meta/recipes-core/meta/meta-environment.bb +++ b/import-layers/yocto-poky/meta/recipes-core/meta/meta-environment.bb @@ -12,6 +12,8 @@ REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" inherit toolchain-scripts TOOLCHAIN_NEED_CONFIGSITE_CACHE_append = " zlib" +# Need to expand here before cross-candian changes HOST_ARCH -> SDK_ARCH +TOOLCHAIN_CONFIGSITE_NOCACHE := "${TOOLCHAIN_CONFIGSITE_NOCACHE}" SDK_DIR = "${WORKDIR}/sdk" SDK_OUTPUT = "${SDK_DIR}/image" diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-extsdk-toolchain.bb b/import-layers/yocto-poky/meta/recipes-core/meta/meta-extsdk-toolchain.bb new file mode 100644 index 000000000..2bd9a5b32 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-core/meta/meta-extsdk-toolchain.bb @@ -0,0 +1,28 @@ +SUMMARY = "Extensible SDK toolchain meta-recipe" +DESCRIPTION = "Meta-recipe for ensuring the build directory contains all appropriate toolchain packages for using an IDE" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native" + +do_populate_sysroot[deptask] = "do_populate_sysroot" + +# NOTE: There is logic specific to this recipe in setscene_depvalid() +# within sstate.bbclass, so if you copy or rename this and expect the same +# functionality you'll need to modify that as well. + +LOCKED_SIGS_INDIR = "${D}/locked-sigs" + +addtask do_locked_sigs after do_populate_sysroot +SSTATETASKS += "do_locked_sigs" +do_locked_sigs[sstate-inputdirs] = "${LOCKED_SIGS_INDIR}" +do_locked_sigs[sstate-outputdirs] = "${STAGING_DIR_HOST}/locked-sigs" + +python do_locked_sigs() { + import oe.copy_buildsystem + outdir = os.path.join(d.getVar('LOCKED_SIGS_INDIR', True)) + bb.utils.mkdirhier(outdir) + sigfile = os.path.join(outdir, 'locked-sigs-extsdk-toolchain.inc') + oe.copy_buildsystem.generate_locked_sigs(sigfile, d) +} diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-ide-support.bb b/import-layers/yocto-poky/meta/recipes-core/meta/meta-ide-support.bb index 86c57cda2..c4ddcfcb4 100644 --- a/import-layers/yocto-poky/meta/recipes-core/meta/meta-ide-support.bb +++ b/import-layers/yocto-poky/meta/recipes-core/meta/meta-ide-support.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d DEPENDS = "virtual/libc gdb-cross-${TARGET_ARCH} qemu-native qemu-helper-native unfs3-native" PR = "r3" -inherit meta toolchain-scripts +inherit meta toolchain-scripts nopackages do_populate_ide_support () { toolchain_create_tree_env_script diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/meta-world-pkgdata.bb b/import-layers/yocto-poky/meta/recipes-core/meta/meta-world-pkgdata.bb index 3c5db5001..81c8647fa 100644 --- a/import-layers/yocto-poky/meta/recipes-core/meta/meta-world-pkgdata.bb +++ b/import-layers/yocto-poky/meta/recipes-core/meta/meta-world-pkgdata.bb @@ -1,5 +1,6 @@ SUMMARY = "Pulls in pkgdata for world" LICENSE = "MIT" + INHIBIT_DEFAULT_DEPS = "1" addtask do_allpackagedata before do_build diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/signing-keys.bb b/import-layers/yocto-poky/meta/recipes-core/meta/signing-keys.bb index e843301b2..37790373a 100644 --- a/import-layers/yocto-poky/meta/recipes-core/meta/signing-keys.bb +++ b/import-layers/yocto-poky/meta/recipes-core/meta/signing-keys.bb @@ -1,7 +1,7 @@ # Copyright (C) 2015 Intel Corporation # Released under the MIT license (see COPYING.MIT for the terms) -DESCRIPTION = "Make public keys of the signing keys available" +SUMMARY = "Makes public keys of the signing keys available" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" @@ -12,6 +12,8 @@ inherit allarch deploy EXCLUDE_FROM_WORLD = "1" INHIBIT_DEFAULT_DEPS = "1" +SYSROOT_DIRS += "${sysconfdir}/pki" + PACKAGES =+ "${PN}-ipk ${PN}-rpm ${PN}-packagefeed" FILES_${PN}-rpm = "${sysconfdir}/pki/rpm-gpg" @@ -54,10 +56,6 @@ do_install () { fi } -sysroot_stage_all_append () { - sysroot_stage_dir ${D}${sysconfdir}/pki ${SYSROOT_DESTDIR}${sysconfdir}/pki -} - do_deploy () { if [ -f "${B}/rpm-key" ]; then install -D -m 0644 "${B}/rpm-key" "${DEPLOYDIR}/RPM-GPG-KEY-${DISTRO_VERSION}" diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/testexport-tarball.bb b/import-layers/yocto-poky/meta/recipes-core/meta/testexport-tarball.bb new file mode 100644 index 000000000..d9861c4da --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-core/meta/testexport-tarball.bb @@ -0,0 +1,58 @@ +DESCRIPTION = "SDK type target for standalone tarball containing packages defined by TEST_EXPORT_TOOLS. The \ + tarball can be used to run missing programs on testing systems which don't have such tools.\ + This recipe is almost the same as buildtools-tarball" +SUMMARY = "Standalone tarball for test systems with missing software" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +TEST_EXPORT_SDK_PACKAGES ??= "" + +TOOLCHAIN_TARGET_TASK ?= "" + +TOOLCHAIN_HOST_TASK ?= "${TEST_EXPORT_SDK_PACKAGES}" + +SDK_PACKAGE_ARCHS += "tesexport-tools-${SDKPKGSUFFIX}" + +TOOLCHAIN_OUTPUTNAME ?= "${TEST_EXPORT_SDK_NAME}" + +SDK_TITLE = "Testexport tools" + +RDEPENDS = "${TOOLCHAIN_HOST_TASK}" + +EXCLUDE_FROM_WORLD = "1" + +inherit meta +inherit populate_sdk +inherit toolchain-scripts + +create_sdk_files_append () { + rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* + rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* + rm -f ${SDK_OUTPUT}/${SDKPATH}/version-* + + # Generate new (mini) sdk-environment-setup file + script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}} + touch $script + echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script + # In order for the self-extraction script to correctly extract and set up things, + # we need a 'OECORE_NATIVE_SYSROOT=xxx' line in environment setup script. + # However, testexport-tarball is inherently a tool set instead of a fully functional SDK, + # so instead of exporting the variable, we use a comment here. + echo '#OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script + toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} + + echo 'export GIT_SSL_CAINFO="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script + + 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 + fi +} + +# testexport-tarball doesn't need config site +TOOLCHAIN_NEED_CONFIGSITE_CACHE = "" + +# The recipe doesn't need any default deps +INHIBIT_DEFAULT_DEPS = "1" diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb b/import-layers/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb index a983e42c6..e203a8322 100644 --- a/import-layers/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb +++ b/import-layers/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb @@ -16,6 +16,12 @@ TOOLCHAIN_HOST_TASK = "\ INHIBIT_DEFAULT_DEPS = "1" +MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" +PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}" +PACKAGE_ARCHS = "" +TARGET_ARCH = "none" +TARGET_OS = "none" + TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-nativesdk-libc" RDEPENDS = "${TOOLCHAIN_HOST_TASK}" @@ -24,14 +30,19 @@ EXCLUDE_FROM_WORLD = "1" inherit meta inherit populate_sdk +inherit nopackages deltask install deltask package deltask packagedata +deltask populate_sysroot + +do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" SDK_DEPENDS += "patchelf-native" SDK_PACKAGING_FUNC = "" +REAL_MULTIMACH_TARGET_SYS = "none" fakeroot create_sdk_files() { cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ @@ -44,13 +55,12 @@ fakeroot create_sdk_files() { fakeroot tar_sdk() { - mkdir -p ${SDK_DEPLOY} cd ${SDK_OUTPUT}/${SDKPATH} DEST="./${SDK_ARCH}-${SDK_OS}" mv sysroots/${SDK_SYS} $DEST rm sysroots -rf - patchelf --set-interpreter ${@''.join('a' for n in xrange(1024))} $DEST/usr/bin/patchelf + patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative - tar ${SDKTAROPTS} -c -j --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . + tar ${SDKTAROPTS} -c -j --file=${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . } |
