summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-02-25 16:59:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:03 +0000
commitb41862d33488d77f3b7c1e897490ea5cb2a35f67 (patch)
tree8f4c7f73f19c037b0bc89ec845213a33d134fd72 /meta/recipes-core
parent4d1c14ff908480b47b67574e472e30c12d1e3f59 (diff)
downloadpoky-b41862d33488d77f3b7c1e897490ea5cb2a35f67.tar.gz
uninative-tarball: respect SDKMACHINE when building
So that a single machine can build multiple architectures for the uninative-tarball respect SDK_ARCH instead of BUILD_ARCH. This means a x86-64 host can build a i686 uninative-tarball by setting SDKMACHINE=i686. (From OE-Core rev: 11b0e7e1cb29fd1fbe06bdb5606a55b92ecdcc89) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/meta/uninative-tarball.bb10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb
index 21f3bd9859..ab1015fcfa 100644
--- a/meta/recipes-core/meta/uninative-tarball.bb
+++ b/meta/recipes-core/meta/uninative-tarball.bb
@@ -13,7 +13,7 @@ TOOLCHAIN_HOST_TASK = "\
13 13
14INHIBIT_DEFAULT_DEPS = "1" 14INHIBIT_DEFAULT_DEPS = "1"
15 15
16TOOLCHAIN_OUTPUTNAME ?= "${BUILD_ARCH}-nativesdk-libc" 16TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-nativesdk-libc"
17 17
18RDEPENDS = "${TOOLCHAIN_HOST_TASK}" 18RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
19 19
@@ -43,9 +43,11 @@ fakeroot create_sdk_files() {
43fakeroot tar_sdk() { 43fakeroot tar_sdk() {
44 mkdir -p ${SDK_DEPLOY} 44 mkdir -p ${SDK_DEPLOY}
45 cd ${SDK_OUTPUT}/${SDKPATH} 45 cd ${SDK_OUTPUT}/${SDKPATH}
46 mv sysroots/${SDK_SYS} ./${BUILD_SYS} 46
47 DEST="./${SDK_ARCH}-${SDK_OS}"
48 mv sysroots/${SDK_SYS} $DEST
47 rm sysroots -rf 49 rm sysroots -rf
48 patchelf --set-interpreter ${@''.join('a' for n in xrange(1024))} ./${BUILD_SYS}/usr/bin/patchelf 50 patchelf --set-interpreter ${@''.join('a' for n in xrange(1024))} $DEST/usr/bin/patchelf
49 mv ./${BUILD_SYS}/usr/bin/patchelf ./${BUILD_SYS}/usr/bin/patchelf-uninative 51 mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative
50 tar ${SDKTAROPTS} -c -j --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . 52 tar ${SDKTAROPTS} -c -j --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
51} 53}