summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_deb.bbclass
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-09-14 22:30:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-15 11:23:56 +0100
commitc2bbc59b215aebed4771e7735a76648abbe86bbd (patch)
treeb2496ae274dd698f50645581b8d0ea17823fd9da /meta/classes/populate_sdk_deb.bbclass
parent90ded12e485657f776fa9dac6567c9c84c28fa63 (diff)
downloadpoky-c2bbc59b215aebed4771e7735a76648abbe86bbd.tar.gz
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. (From OE-Core rev: 63010b9ee89643c8e83656783231f0a7848d9e45) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_deb.bbclass')
-rw-r--r--meta/classes/populate_sdk_deb.bbclass6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 40516b856c..2cff69e827 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -2,6 +2,10 @@ do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_popul
2do_populate_sdk[recrdeptask] += "do_package_write_deb" 2do_populate_sdk[recrdeptask] += "do_package_write_deb"
3 3
4 4
5DEB_SDK_ARCH = "${@[bb.data.getVar('SDK_ARCH', d, 1), "i386"]\
6 [bb.data.getVar('SDK_ARCH', d, 1) in \
7 ["x86", "i486", "i586", "i686", "pentium"]]}"
8
5populate_sdk_post_deb () { 9populate_sdk_post_deb () {
6 10
7 local target_rootfs=$1 11 local target_rootfs=$1
@@ -37,7 +41,7 @@ fakeroot populate_sdk_deb () {
37 ## install nativesdk ## 41 ## install nativesdk ##
38 echo "Installing NATIVESDK packages" 42 echo "Installing NATIVESDK packages"
39 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}" 43 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
40 export INSTALL_BASEARCH_DEB="${SDK_ARCH}" 44 export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}"
41 export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}" 45 export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
42 export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}" 46 export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
43 export INSTALL_PACKAGES_ATTEMPTONLY_DEB="" 47 export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""