summaryrefslogtreecommitdiffstats
path: root/meta
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:46:32 +0100
commitaca6dae9dcdde59c3aeb0a9afd1a9538f1288e3a (patch)
tree868c4166df2e9aa5c244e30070e73f69baa3f09b /meta
parent0e421c93a85ee307d4a1a2508f7c1fc533bb6a8b (diff)
downloadpoky-aca6dae9dcdde59c3aeb0a9afd1a9538f1288e3a.tar.gz
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 (From OE-Core rev: b01a01ff47e09da4aaa2db992380ca0498f0e5ae) Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 = "\
33 " 33 "
34 34
35EXTRA_OECONF += "TAR=tar" 35EXTRA_OECONF += "TAR=tar"
36EXTRA_OECONF += "DEB_HOST_ARCH=${DPKG_ARCH}"
36 37
37do_configure () { 38do_configure () {
38 echo >> ${S}/m4/compiler.m4 39 echo >> ${S}/m4/compiler.m4