summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-24 17:23:05 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-24 17:23:05 +0000
commit1e1e9a3209d1b255f9f2dd201b56077da8f89de7 (patch)
treebfe4d1dbc0d4b53dbfc5f40e6e4213044830c713 /meta/classes
parentebf771bc5aa6c171966d9b478a0dbfe48304a5c3 (diff)
downloadopenembedded-core-1e1e9a3209d1b255f9f2dd201b56077da8f89de7.tar.gz
openembedded-core-1e1e9a3209d1b255f9f2dd201b56077da8f89de7.tar.bz2
openembedded-core-1e1e9a3209d1b255f9f2dd201b56077da8f89de7.tar.xz
openembedded-core-1e1e9a3209d1b255f9f2dd201b56077da8f89de7.zip
package_deb.bbclass: Handle all architecture as a special case solving multimachine build issues
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@953 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_deb.bbclass10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index c19a9249d..ae085c301 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -154,16 +154,18 @@ python do_package_deb () {
def pullData(l, d):
l2 = []
for i in l:
- l2.append(bb.data.getVar(i, d, 1))
+ 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':
+ data = 'all'
+ l2.append(data)
return l2
ctrlfile.write("Package: %s\n" % pkgname)
# check for required fields
try:
for (c, fs) in fields:
- for f in fs:
- if bb.data.getVar(f, localdata) is None:
- raise KeyError(f)
ctrlfile.write(unicode(c % tuple(pullData(fs, localdata))))
except KeyError:
(type, value, traceback) = sys.exc_info()