diff options
| author |   Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2013-04-02 14:35:56 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-03 16:54:34 +0100 |
| commit | 6f86fe5d66e401377bccd9f635270033b99a9f4b (patch) | |
| tree | ec176a49112627d9894b8d11c8e45c1c167a0a70 /meta/classes | |
| parent | 2ddb7afd15e53ef75b5084d691115e0f58ff24ab (diff) | |
| download | openembedded-core-contrib-6f86fe5d66e401377bccd9f635270033b99a9f4b.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]
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/package_deb.bbclass | 8 |
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 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 () { |