summaryrefslogtreecommitdiffstats
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
parentf0dde94f56045651e7a7de4c287054c0d0ee3485 (diff)
downloadpoky-f2287f417a884fcd839666d6a8de73ec78ab410a.tar.gz
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
-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"
8DISTRO_EXTRA_RDEPENDS += "dpkg" 8DISTRO_EXTRA_RDEPENDS += "dpkg"
9IMAGE_PKGTYPE ?= "deb" 9IMAGE_PKGTYPE ?= "deb"
10 10
11# Map TARGET_ARCH to Debian's ideas about architectures
12DPKG_ARCH ?= "${TARGET_ARCH}"
13DPKG_ARCH_x86 ?= "i386"
14DPKG_ARCH_i486 ?= "i386"
15DPKG_ARCH_i586 ?= "i386"
16DPKG_ARCH_i686 ?= "i386"
17DPKG_ARCH_pentium ?= "i386"
18
11python package_deb_fn () { 19python package_deb_fn () {
12 from bb import data 20 from bb import data
13 bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d) 21 bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
@@ -162,7 +170,7 @@ python do_package_deb () {
162 fields.append(["Section: %s\n", ['SECTION']]) 170 fields.append(["Section: %s\n", ['SECTION']])
163 fields.append(["Priority: %s\n", ['PRIORITY']]) 171 fields.append(["Priority: %s\n", ['PRIORITY']])
164 fields.append(["Maintainer: %s\n", ['MAINTAINER']]) 172 fields.append(["Maintainer: %s\n", ['MAINTAINER']])
165 fields.append(["Architecture: %s\n", ['TARGET_ARCH']]) 173 fields.append(["Architecture: %s\n", ['DPKG_ARCH']])
166 fields.append(["OE: %s\n", ['PN']]) 174 fields.append(["OE: %s\n", ['PN']])
167 fields.append(["Homepage: %s\n", ['HOMEPAGE']]) 175 fields.append(["Homepage: %s\n", ['HOMEPAGE']])
168 176
@@ -176,7 +184,7 @@ python do_package_deb () {
176 data = bb.data.getVar(i, d, 1) 184 data = bb.data.getVar(i, d, 1)
177 if data is None: 185 if data is None:
178 raise KeyError(f) 186 raise KeyError(f)
179 if i == 'TARGET_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, 1) == 'all': 187 if i == 'DPKG_ARCH' and bb.data.getVar('PACKAGE_ARCH', d, 1) == 'all':
180 data = 'all' 188 data = 'all'
181 l2.append(data) 189 l2.append(data)
182 return l2 190 return l2