[oe-commits] [openembedded-core] 69/116: uninative-tarball: respect SDKMACHINE when building

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 0f65d693531948b1121dea43bde03382afe87918
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Thu Feb 25 16:59:39 2016 +0000

    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.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-core/meta/uninative-tarball.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb
index 21f3bd9..ab1015f 100644
--- a/meta/recipes-core/meta/uninative-tarball.bb
+++ b/meta/recipes-core/meta/uninative-tarball.bb
@@ -13,7 +13,7 @@ TOOLCHAIN_HOST_TASK = "\
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-TOOLCHAIN_OUTPUTNAME ?= "${BUILD_ARCH}-nativesdk-libc"
+TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-nativesdk-libc"
 
 RDEPENDS = "${TOOLCHAIN_HOST_TASK}"
 
@@ -43,9 +43,11 @@ fakeroot create_sdk_files() {
 fakeroot tar_sdk() {
 	mkdir -p ${SDK_DEPLOY}
 	cd ${SDK_OUTPUT}/${SDKPATH}
-	mv sysroots/${SDK_SYS} ./${BUILD_SYS}
+
+	DEST="./${SDK_ARCH}-${SDK_OS}"
+	mv sysroots/${SDK_SYS} $DEST
 	rm sysroots -rf
-	patchelf --set-interpreter ${@''.join('a' for n in xrange(1024))} ./${BUILD_SYS}/usr/bin/patchelf
-	mv ./${BUILD_SYS}/usr/bin/patchelf ./${BUILD_SYS}/usr/bin/patchelf-uninative
+	patchelf --set-interpreter ${@''.join('a' for n in xrange(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 .
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.