diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-26 10:13:21 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-27 08:31:09 +0100 |
| commit | 7952151dfc45c126041fedf826b94e61030d65a5 (patch) | |
| tree | 3504d0898a20f6658a71f61ba4ac70f775f2061a /meta/classes | |
| parent | 4310088f23488b6f6daf72e40dbde0f5563e73ab (diff) | |
| download | openembedded-core-contrib-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/classes')
| -rw-r--r-- | meta/classes/populate_sdk_deb.bbclass | 15 |
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" |