[oe-commits] Richard Purdie : populate_sdk_deb: Fix non x86_64 SDK builds
git at git.openembedded.org
git at git.openembedded.org
Sun Jul 27 07:35:27 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 2a7c6f6d3e9d1eedffb79f2347400509feed5dd7
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=2a7c6f6d3e9d1eedffb79f2347400509feed5dd7
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Sat Jul 26 10:13:21 2014 +0100
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 at linuxfoundation.org>
---
meta/classes/populate_sdk_deb.bbclass | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index acb1f73..6690e2e 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"
More information about the Openembedded-commits
mailing list