summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2014-03-11 11:07:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-11 07:54:14 -0700
commita08eacc6d821d6946b23a99bca5abf785875b1cf (patch)
tree5fd5268ae080ce197b32b18e5e69e7e67158c0c2
parentf4bf21b40ec6fa07c4a7bb450e3cfae12128dc2c (diff)
downloadopenembedded-core-a08eacc6d821d6946b23a99bca5abf785875b1cf.tar.gz
openembedded-core-a08eacc6d821d6946b23a99bca5abf785875b1cf.tar.bz2
openembedded-core-a08eacc6d821d6946b23a99bca5abf785875b1cf.zip
package_deb: Map TARGET_ARCH x86_64 to DPKG_ARCH amd64
Without this patch packages are generated as x86_64. Which cannot be installed by default. root@qt5022:~# dpkg -i alsa-utils_1.0.27.2-r0_x86-64.deb dpkg: error processing alsa-utils_1.0.27.2-r0_x86-64.deb (--install): package architecture (x86-64) does not match system (amd64) Errors were encountered while processing: alsa-utils_1.0.27.2-r0_x86-64.deb Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_deb.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index a16d57e855..9ae0017f47 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -295,6 +295,8 @@ python () {
darch = d.getVar('DPKG_ARCH', True)
if darch in ["x86", "i486", "i586", "i686", "pentium"]:
d.setVar('DPKG_ARCH', 'i386')
+ elif darch == "x86_64":
+ d.setVar('DPKG_ARCH', 'amd64')
elif darch == "arm":
d.setVar('DPKG_ARCH', 'armel')
}