summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-09-27 20:26:26 +0000
committerRichard Purdie <richard@openedhand.com>2007-09-27 20:26:26 +0000
commitf2287f417a884fcd839666d6a8de73ec78ab410a (patch)
tree6df3b700e81b2b993db9a005ac3529ba34daca23 /meta/classes
parentf0dde94f56045651e7a7de4c287054c0d0ee3485 (diff)
downloadopenembedded-core-f2287f417a884fcd839666d6a8de73ec78ab410a.tar.gz
openembedded-core-f2287f417a884fcd839666d6a8de73ec78ab410a.tar.bz2
openembedded-core-f2287f417a884fcd839666d6a8de73ec78ab410a.zip
package_deb.bbclass: Create DPKG_ARCH to allow mapping between debian archs and Poky ones
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2817 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_deb.bbclass12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index d94fae5c90..b85ffe254f 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -8,6 +8,14 @@ BOOTSTRAP_EXTRA_RDEPENDS += "dpkg"
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)
@@ -162,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']])
@@ -176,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