]> code.ossystems Code Review - openembedded-core.git/commit
package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build
authorDexuan Cui <dexuan.cui@intel.com>
Wed, 14 Sep 2011 14:30:14 +0000 (22:30 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 15 Sep 2011 10:19:42 +0000 (11:19 +0100)
commit63010b9ee89643c8e83656783231f0a7848d9e45
tree3ebc6b9f819c7bb4a2fa323d12db02ec7edcc7fb
parent2fc778068ebbd97b0fb473fb35a3eca03da86542
package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build

[YOCTO #1070]

Currently with deb packaging, we have 2 issues when running
"bitbake meta-toolchain-gmae".

1) when MACHINE="qemux86", SDKMACHINE="i686", INSTALL_BASEARCH_DEB is "i686",
too. This causes the following ERROR:
| E: Couldn't find package task-sdk-host-nativesdk
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed

This is becasue: due to the DPKG_ARCH mapping, we create such a deb package
tmp/deploy/deb/i686-nativesdk/task-sdk-host-nativesdk_1.0-r10_i386.deb; dpkg
can't recoginze the package. We need to map INSTALL_BASEARCH_DEB in the same
way.

2) when MACHINE="qemux86", SDKMACHINE="x86_64", INSTALL_BASEARCH_DEB is
"x86_64", too.
We get such an ERROR:
| E: Couldn't find package task-cross-canadian-i586
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed

This is because: dpkg can't recognize the generated package
tmp/deploy/deb/x86_64-nativesdk/task-cross-canadian-i586_1.0-r0_i386.deb
Here the "i386" suffix is incorrect and should be "x86_64" -- the i386
comes from the line
DPKG_ARCH_i586 ?= "i386" in package_deb.bbclass.
However, for canadian package, actually here the overriding of DPKG (from
"x86-64" to "i386") should not happen -- it accidently happens just because
TARGET_ARCH exists in OVERRIDES. We can move the overriding logic to the
anonymous python function to work this around.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
meta/classes/package_deb.bbclass
meta/classes/populate_sdk_deb.bbclass