summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-02 23:47:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-04 00:07:29 +0100
commit25c46772a85384144e1fb1ecad3b6956c67c4e07 (patch)
treed7033c9245a5e20fbdedaec10a1bd6b16bfb49d6 /meta/recipes-core
parente1de69667481749d4e1081210a3a216378d034c9 (diff)
downloadpoky-25c46772a85384144e1fb1ecad3b6956c67c4e07.tar.gz
buildtools-tarball/uninative-tarball: Fix for working with populate_sdk under sstate control
Firstly, these recipes are not target (MACHINE) specific so they should by SDK_ARCH based, not PACKAGE_ARCH. Also fix use of SDK_DEPLOY -> SDKDEPOLYDIR after other recent changes. Together these fixes avoid various build failures and ensure the tarballs only get built once rather than multiple times. (From OE-Core rev: 894c9b6ded702897ae4084ef75959cdc8cc6f7a3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb5
-rw-r--r--meta/recipes-core/meta/uninative-tarball.bb8
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
29MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
30PACKAGE_ARCH = "${SDK_ARCH}"
31
29SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" 32SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}"
30 33
31TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" 34TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}"
@@ -40,6 +43,8 @@ inherit meta
40inherit populate_sdk 43inherit populate_sdk
41inherit toolchain-scripts 44inherit toolchain-scripts
42 45
46do_populate_sdk[stamp-extra-info] = ""
47
43create_sdk_files_append () { 48create_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
17INHIBIT_DEFAULT_DEPS = "1" 17INHIBIT_DEFAULT_DEPS = "1"
18 18
19MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
20PACKAGE_ARCH = "${SDK_ARCH}"
21
19TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-nativesdk-libc" 22TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-nativesdk-libc"
20 23
21RDEPENDS = "${TOOLCHAIN_HOST_TASK}" 24RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
@@ -29,6 +32,8 @@ deltask install
29deltask package 32deltask package
30deltask packagedata 33deltask packagedata
31 34
35do_populate_sdk[stamp-extra-info] = ""
36
32SDK_DEPENDS += "patchelf-native" 37SDK_DEPENDS += "patchelf-native"
33 38
34SDK_PACKAGING_FUNC = "" 39SDK_PACKAGING_FUNC = ""
@@ -44,7 +49,6 @@ fakeroot create_sdk_files() {
44 49
45 50
46fakeroot tar_sdk() { 51fakeroot 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}