aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2016-08-08 11:56:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:45:32 +0100
commitb01a01ff47e09da4aaa2db992380ca0498f0e5ae (patch)
tree72ea9177f39a3fc40d081992b64622e11657cc6e
parenta8431689983f5860173548acd899e6806906e4d1 (diff)
downloadopenembedded-core-b01a01ff47e09da4aaa2db992380ca0498f0e5ae.tar.gz
openembedded-core-b01a01ff47e09da4aaa2db992380ca0498f0e5ae.tar.bz2
openembedded-core-b01a01ff47e09da4aaa2db992380ca0498f0e5ae.zip
dpkg: Avoid automatic target architecture detection
dpkg is using a script (dpkg-architecture.pl) to detect the target architecture automatically. Unfortunately, it is using the cross compiler prefix to do the detection and for ARM, oe-core is using <vendor>-linux-gnueabi for toolchains with and without call-convention hard. The script then always detects 'armel' and never gets 'armhf' for call-convention hard. This solves: dpkg: error processing archive evtest_1.32+0+b8343ec112-r0_armhf.deb (--install): package architecture (armhf) does not match system (armel) Errors were encountered while processing: evtest_1.32+0+b8343ec112-r0_armhf.deb Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 58978015bd..52a9bd7e2a 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -33,6 +33,7 @@ EXTRA_OECONF = "\
"
EXTRA_OECONF += "TAR=tar"
+EXTRA_OECONF += "DEB_HOST_ARCH=${DPKG_ARCH}"
do_configure () {
echo >> ${S}/m4/compiler.m4