summaryrefslogtreecommitdiffstats
path: root/meta
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:31:09 +0100
commit7952151dfc45c126041fedf826b94e61030d65a5 (patch)
tree3504d0898a20f6658a71f61ba4ac70f775f2061a /meta
parent4310088f23488b6f6daf72e40dbde0f5563e73ab (diff)
downloadpoky-7952151dfc45c126041fedf826b94e61030d65a5.tar.gz
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] (From OE-Core rev: 2a7c6f6d3e9d1eedffb79f2347400509feed5dd7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@
1do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot" 1do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_populate_sysroot bzip2-native:do_populate_sysroot"
2 2
3DEB_SDK_ARCH = "${@[d.getVar('SDK_ARCH', True), "i386"]\ 3python () {
4 [d.getVar('SDK_ARCH', True) in \ 4 # Map TARGET_ARCH to Debian's ideas about architectures
5 ["x86", "i486", "i586", "i686", "pentium"]]}" 5 darch = d.getVar('SDK_ARCH', True)
6 if darch in ["x86", "i486", "i586", "i686", "pentium"]:
7 d.setVar('DEB_SDK_ARCH', 'i386')
8 elif darch == "x86_64":
9 d.setVar('DEB_SDK_ARCH', 'amd64')
10 elif darch == "arm":
11 d.setVar('DEB_SDK_ARCH', 'armel')
12}
6 13
7DEB_SDK_ARCH = "${@[d.getVar('SDK_ARCH', True), "amd64"]\
8 [d.getVar('SDK_ARCH', True) == "x86_64"]}"
9 14
10do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock" 15do_populate_sdk[lockfiles] += "${DEPLOY_DIR_DEB}/deb.lock"
11 16