[oe-commits] Ricardo Ribalda Delgado : package_deb: Map TARGET_ARCH x86_64 to DPKG_ARCH amd64

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: a08eacc6d821d6946b23a99bca5abf785875b1cf
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a08eacc6d821d6946b23a99bca5abf785875b1cf

Author: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
Date:   Tue Mar 11 11:07:35 2014 +0100

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 at 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 at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package_deb.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index a16d57e..9ae0017 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')
 }