From 8866aeefb7e471d71cca0d2329ee48c87700abba Mon Sep 17 00:00:00 2001 From: Bogdan Marinescu Date: Tue, 2 Apr 2013 14:35:56 +0300 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'meta/classes/package_deb.bbclass') 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 IMAGE_PKGTYPE ?= "deb" DPKG_ARCH ?= "${TARGET_ARCH}" -DPKG_ARCH_arm ?= "armel" PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs" @@ -406,8 +405,11 @@ python () { d.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1") # Map TARGET_ARCH to Debian's ideas about architectures - if d.getVar('DPKG_ARCH', True) in ["x86", "i486", "i586", "i686", "pentium"]: - d.setVar('DPKG_ARCH', 'i386') + darch = d.getVar('DPKG_ARCH', True) + if darch in ["x86", "i486", "i586", "i686", "pentium"]: + d.setVar('DPKG_ARCH', 'i386') + elif darch == "arm": + d.setVar('DPKG_ARCH', 'armel') } python do_package_write_deb () { -- cgit v1.2.3-54-g00ecf