[oe-commits] [openembedded-core] 28/51: dpkg: Avoid automatic target architecture detection

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit b01a01ff47e09da4aaa2db992380ca0498f0e5ae
Author: Alexandre Belloni <alexandre.belloni at free-electrons.com>
AuthorDate: Mon Aug 8 11:56:09 2016 +0200

    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 at free-electrons.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 5897801..52a9bd7 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.