[oe-commits] org.oe.dev package_deb.bbclass: Map TARGET_ARCH to DPKG_ARCH to keep dpkg/apt happy with 'valid' archs (from poky)

[rpurdie commit]

package_deb.bbclass: Map TARGET_ARCH to DPKG_ARCH to keep dpkg/apt happy with 'valid' archs (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d7765554c3e4f1e39d43d329e9c38943eb93901a
ViewMTN: http://monotone.openembedded.org/revision/info/d7765554c3e4f1e39d43d329e9c38943eb93901a
Files:
1
classes/package_deb.bbclass
Diffs:

#
# mt diff -r75c6a806470b2ec834f5414f6369c599b05c163f -rd7765554c3e4f1e39d43d329e9c38943eb93901a
#
# 
# 
# patch "classes/package_deb.bbclass"
#  from [a9e3536edbfc3c7688cdfdf6eb31098a6756cb91]
#    to [f46fb56c8a74106712e5cea2bf2e7b708be5e047]
# 
============================================================
--- classes/package_deb.bbclass	a9e3536edbfc3c7688cdfdf6eb31098a6756cb91
+++ classes/package_deb.bbclass	f46fb56c8a74106712e5cea2bf2e7b708be5e047
@@ -8,6 +8,14 @@ IMAGE_PKGTYPE ?= "deb"
 DISTRO_EXTRA_RDEPENDS += "dpkg"
 IMAGE_PKGTYPE ?= "deb"
 
+# Map TARGET_ARCH to Debian's ideas about architectures
+DPKG_ARCH ?= "${TARGET_ARCH}" 
+DPKG_ARCH_x86 ?= "i386"
+DPKG_ARCH_i486 ?= "i386"
+DPKG_ARCH_i586 ?= "i386"
+DPKG_ARCH_i686 ?= "i386"
+DPKG_ARCH_pentium ?= "i386"
+
 python package_deb_fn () {
     from bb import data
     bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
@@ -141,6 +149,7 @@ python do_package_deb () {
             note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
             unlockfile(lf)
             continue
+
         controldir = os.path.join(root, 'DEBIAN')
         bb.mkdirhier(controldir)
         os.chmod(controldir, 0755)
@@ -161,7 +170,7 @@ python do_package_deb () {
         fields.append(["Section: %s\n", ['SECTION']])
         fields.append(["Priority: %s\n", ['PRIORITY']])
         fields.append(["Maintainer: %s\n", ['MAINTAINER']])
-        fields.append(["Architecture: %s\n", ['TARGET_ARCH']])
+        fields.append(["Architecture: %s\n", ['DPKG_ARCH']])
         fields.append(["OE: %s\n", ['PN']])
         fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
@@ -175,7 +184,7 @@ python do_package_deb () {
                 data = bb.data.getVar(i, d, 1)
                 if data is None:
                     raise KeyError(f)
-		if i == 'TARGET_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, 1) == 'all':
+		if i == 'DPKG_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, 1) == 'all':
                     data = 'all'
                 l2.append(data)
             return l2