diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-core/meta')
9 files changed, 80 insertions, 24 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/dummy-sdk-package.inc b/import-layers/yocto-poky/meta/recipes-core/meta/dummy-sdk-package.inc new file mode 100644 index 000000000..ed83dd77d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-core/meta/dummy-sdk-package.inc @@ -0,0 +1,24 @@ +SUMMARY = "Dummy packages which handle excluding packages from the sdk, e.g. ensuring perl is excluded from buildtools" +LICENSE = "MIT" + +inherit allarch + +python() { + # Put the package somewhere separate to ensure it's never used except + # when we want it + # (note that we have to do this in anonymous python here to avoid + # allarch.bbclass disabling itself) + d.setVar('PACKAGE_ARCH', '${DUMMYARCH}') +} + +ALLOW_EMPTY_${PN} = "1" + +PR[vardeps] += "DUMMYPROVIDES" + +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}") +} + 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 29da121a3..09f757a08 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 @@ -55,6 +55,8 @@ create_sdk_files() { # Add version information toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS} + + toolchain_create_post_relocate_script ${SDK_OUTPUT}/${SDKPATH}/post-relocate-setup.sh } do_install() { 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 02abd8aff..b29986137 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 @@ -3,6 +3,8 @@ LICENSE = "MIT" INHIBIT_DEFAULT_DEPS = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + addtask do_allpackagedata before do_build do_allpackagedata() { : diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb index 0b58a027f..f5bcb8254 100644 --- a/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb +++ b/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb @@ -1,26 +1,11 @@ -SUMMARY = "Dummy package which ensures perl is excluded from buildtools" -LICENSE = "MIT" +DUMMYARCH = "buildtools-dummy-${SDKPKGSUFFIX}" -inherit allarch +DUMMYPROVIDES = "\ + nativesdk-perl \ + nativesdk-perl-module-file-path" PR = "r2" -python() { - # Put the package somewhere separate to ensure it's never used except - # when we want it - # (note that we have to do this in anonymous python here to avoid - # allarch.bbclass disabling itself) - d.setVar('PACKAGE_ARCH', 'buildtools-dummy-${SDKPKGSUFFIX}') -} - -PERLPACKAGES = "nativesdk-perl \ - nativesdk-perl-module-file-path" - -ALLOW_EMPTY_${PN} = "1" - -python populate_packages_prepend() { - d.appendVar(d.expand('RPROVIDES_${PN}'), '${PERLPACKAGES}') - d.appendVar(d.expand('RCONFLICTS_${PN}'), '${PERLPACKAGES}') - d.appendVar(d.expand('RREPLACES_${PN}'), '${PERLPACKAGES}') -} +require dummy-sdk-package.inc +inherit nativesdk diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb new file mode 100644 index 000000000..11a727d48 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb @@ -0,0 +1,15 @@ +DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}" + +# Add /bin/sh? +DUMMYPROVIDES = "\ + /bin/bash \ + /usr/bin/env \ + /usr/bin/perl \ + pkgconfig \ + libGL.so()(64bit) \ + libGL.so \ +" + +require dummy-sdk-package.inc + +inherit nativesdk 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 2c1cc3845..1e1c7e345 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 @@ -41,6 +41,7 @@ python do_get_public_keys () { } do_get_public_keys[cleandirs] = "${B}" addtask get_public_keys before do_install +do_get_public_keys[depends] += "gnupg-native:do_populate_sysroot" do_install () { if [ -f "${B}/rpm-key" ]; then @@ -68,7 +69,8 @@ do_deploy () { do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_RPM}" # cleandirs should possibly be in deploy.bbclass but we need it do_deploy[cleandirs] = "${DEPLOYDIR}" -# clear stamp-extra-info since MACHINE is normally put there by deploy.bbclass +# clear stamp-extra-info since MACHINE_ARCH is normally put there by +# deploy.bbclass do_deploy[stamp-extra-info] = "" addtask deploy after do_get_public_keys diff --git a/import-layers/yocto-poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/import-layers/yocto-poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb new file mode 100644 index 000000000..714d15d8b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-core/meta/target-sdk-provides-dummy.bb @@ -0,0 +1,11 @@ +DUMMYARCH = "sdk-provides-dummy-target" + +DUMMYPROVIDES = "\ + /bin/sh \ + /bin/bash \ + /usr/bin/env \ + /usr/bin/perl \ + pkgconfig \ +" + +require dummy-sdk-package.inc 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 index 72f5531c5..c38ac902a 100644 --- a/import-layers/yocto-poky/meta/recipes-core/meta/testexport-tarball.bb +++ b/import-layers/yocto-poky/meta/recipes-core/meta/testexport-tarball.bb @@ -10,7 +10,13 @@ TOOLCHAIN_TARGET_TASK ?= "" TOOLCHAIN_HOST_TASK ?= "${TEST_EXPORT_SDK_PACKAGES}" -SDK_PACKAGE_ARCHS += "tesexport-tools-${SDKPKGSUFFIX}" +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 += "testexport-tools-${SDKPKGSUFFIX}" TOOLCHAIN_OUTPUTNAME ?= "${TEST_EXPORT_SDK_NAME}" @@ -22,7 +28,15 @@ EXCLUDE_FROM_WORLD = "1" inherit meta inherit populate_sdk -inherit toolchain-scripts +inherit toolchain-scripts-base +inherit nopackages + +deltask install +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/uninative-tarball.bb b/import-layers/yocto-poky/meta/recipes-core/meta/uninative-tarball.bb index 5fabf7fa3..38c3a314e 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 @@ -13,6 +13,7 @@ TOOLCHAIN_HOST_TASK = "\ nativesdk-glibc-gconv-utf-16 \ nativesdk-glibc-gconv-cp1252 \ nativesdk-patchelf \ + nativesdk-libxcrypt \ " INHIBIT_DEFAULT_DEPS = "1" |
