summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-26 10:13:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-27 08:30:13 +0100
commit2a7c6f6d3e9d1eedffb79f2347400509feed5dd7 (patch)
treed3b81b99b9778b5dcda398fc2c1a4eccdd1ab746
parent9a3240acd0ac64a257bcfd48f743fc85b6c8f449 (diff)
downloadopenembedded-core-contrib-2a7c6f6d3e9d1eedffb79f2347400509feed5dd7.tar.gz
openembedded-core-contrib-2a7c6f6d3e9d1eedffb79f2347400509feed5dd7.tar.bz2
openembedded-core-contrib-2a7c6f6d3e9d1eedffb79f2347400509feed5dd7.zip
populate_sdk_deb: Fix non x86_64 SDK builds
If building with SDKMACHINE=i686 and using the deb backend, populate_sdk would fail. Its clear when looking at the options that the 32 bit values were overwritten. Replace this code with code similar to that used in package_deb itself. [YOCTO #6458] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_deb.bbclass15
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index acb1f73983..6690e2e2ed 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -1,11 +1,16 @@
do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
-DEB_SDK_ARCH = "${@[d.getVar('SDK_ARCH', True), "i386"]\
- [d.getVar('SDK_ARCH', True) in \
- ["x86", "i486", "i586", "i686", "pentium"]]}"
+python () {
+ # Map TARGET_ARCH to Debian's ideas about architectures
+ darch = d.getVar('SDK_ARCH', True)
+ if darch in ["x86", "i486", "i586", "i686", "pentium"]:
+ d.setVar('DEB_SDK_ARCH', 'i386')
+ elif darch == "x86_64":
+ d.setVar('DEB_SDK_ARCH', 'amd64')
+ elif darch == "arm":
+ d.setVar('DEB_SDK_ARCH', 'armel')
+}
-DEB_SDK_ARCH = "${@[d.getVar('SDK_ARCH', True), "amd64"]\
- [d.getVar('SDK_ARCH', True) == "x86_64"]}"
do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"