summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2013-04-02 14:35:56 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-03 17:01:13 +0100
commit8866aeefb7e471d71cca0d2329ee48c87700abba (patch)
tree256acc19c850fac59fceb4e8b8795ad3c1ab5b65 /meta
parent94041f2b3a5bcaea1b97f8916ccf7cda23cbb5cc (diff)
downloadpoky-8866aeefb7e471d71cca0d2329ee48c87700abba.tar.gz
package_deb.bbclass: fix 'armel' override
The 'armel' override for DKPG_ARCH was causing the meta-toolchain build to fail. The assignment was moved to an anonymous fragment of Python code, so it doesn't affect the assignments in cross-canadian.bbclass anymore, thus fixing the issue. [YOCTO #4080] (From OE-Core rev: 6f86fe5d66e401377bccd9f635270033b99a9f4b) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_deb.bbclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 455919913b..853b5ea8a3 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -7,7 +7,6 @@ inherit package
7IMAGE_PKGTYPE ?= "deb" 7IMAGE_PKGTYPE ?= "deb"
8 8
9DPKG_ARCH ?= "${TARGET_ARCH}" 9DPKG_ARCH ?= "${TARGET_ARCH}"
10DPKG_ARCH_arm ?= "armel"
11 10
12PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs" 11PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs"
13 12
@@ -406,8 +405,11 @@ python () {
406 d.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1") 405 d.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1")
407 406
408 # Map TARGET_ARCH to Debian's ideas about architectures 407 # Map TARGET_ARCH to Debian's ideas about architectures
409 if d.getVar('DPKG_ARCH', True) in ["x86", "i486", "i586", "i686", "pentium"]: 408 darch = d.getVar('DPKG_ARCH', True)
410 d.setVar('DPKG_ARCH', 'i386') 409 if darch in ["x86", "i486", "i586", "i686", "pentium"]:
410 d.setVar('DPKG_ARCH', 'i386')
411 elif darch == "arm":
412 d.setVar('DPKG_ARCH', 'armel')
411} 413}
412 414
413python do_package_write_deb () { 415python do_package_write_deb () {