diff options
-rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 5 | ||||
-rw-r--r-- | meta/recipes-core/meta/uninative-tarball.bb | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 34df53191b..e84efabd85 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -26,6 +26,9 @@ TOOLCHAIN_HOST_TASK ?= "\ | |||
26 | nativesdk-locale-base-en-us \ | 26 | nativesdk-locale-base-en-us \ |
27 | " | 27 | " |
28 | 28 | ||
29 | MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" | ||
30 | PACKAGE_ARCH = "${SDK_ARCH}" | ||
31 | |||
29 | SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" | 32 | SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" |
30 | 33 | ||
31 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" | 34 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" |
@@ -40,6 +43,8 @@ inherit meta | |||
40 | inherit populate_sdk | 43 | inherit populate_sdk |
41 | inherit toolchain-scripts | 44 | inherit toolchain-scripts |
42 | 45 | ||
46 | do_populate_sdk[stamp-extra-info] = "" | ||
47 | |||
43 | create_sdk_files_append () { | 48 | create_sdk_files_append () { |
44 | rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* | 49 | rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* |
45 | rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* | 50 | rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* |
diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb index fb147a17f7..7037bddd4b 100644 --- a/meta/recipes-core/meta/uninative-tarball.bb +++ b/meta/recipes-core/meta/uninative-tarball.bb | |||
@@ -16,6 +16,9 @@ TOOLCHAIN_HOST_TASK = "\ | |||
16 | 16 | ||
17 | INHIBIT_DEFAULT_DEPS = "1" | 17 | INHIBIT_DEFAULT_DEPS = "1" |
18 | 18 | ||
19 | MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" | ||
20 | PACKAGE_ARCH = "${SDK_ARCH}" | ||
21 | |||
19 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-nativesdk-libc" | 22 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-nativesdk-libc" |
20 | 23 | ||
21 | RDEPENDS = "${TOOLCHAIN_HOST_TASK}" | 24 | RDEPENDS = "${TOOLCHAIN_HOST_TASK}" |
@@ -29,6 +32,8 @@ deltask install | |||
29 | deltask package | 32 | deltask package |
30 | deltask packagedata | 33 | deltask packagedata |
31 | 34 | ||
35 | do_populate_sdk[stamp-extra-info] = "" | ||
36 | |||
32 | SDK_DEPENDS += "patchelf-native" | 37 | SDK_DEPENDS += "patchelf-native" |
33 | 38 | ||
34 | SDK_PACKAGING_FUNC = "" | 39 | SDK_PACKAGING_FUNC = "" |
@@ -44,7 +49,6 @@ fakeroot create_sdk_files() { | |||
44 | 49 | ||
45 | 50 | ||
46 | fakeroot tar_sdk() { | 51 | fakeroot tar_sdk() { |
47 | mkdir -p ${SDK_DEPLOY} | ||
48 | cd ${SDK_OUTPUT}/${SDKPATH} | 52 | cd ${SDK_OUTPUT}/${SDKPATH} |
49 | 53 | ||
50 | DEST="./${SDK_ARCH}-${SDK_OS}" | 54 | DEST="./${SDK_ARCH}-${SDK_OS}" |
@@ -52,5 +56,5 @@ fakeroot tar_sdk() { | |||
52 | rm sysroots -rf | 56 | rm sysroots -rf |
53 | patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf | 57 | patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf |
54 | mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative | 58 | mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative |
55 | tar ${SDKTAROPTS} -c -j --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . | 59 | tar ${SDKTAROPTS} -c -j --file=${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . |
56 | } | 60 | } |