summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-25 19:35:19 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-25 19:35:19 +0000
commitaa10825598730572f60da1a61b2d6bed87b3bb81 (patch)
treedc029891c8b520de5777d2492e8848fde1e11924 /meta/classes
parent5d60f712ae3bc43d90525880b01a2e2ea03501a2 (diff)
downloadpoky-aa10825598730572f60da1a61b2d6bed87b3bb81.tar.gz
package_ipk.bbclass: Make sure packages which alter PACKAGE_ARCH end up in the correct 'feed'
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3234 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_ipk.bbclass7
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 6dceb284bc..877ea980e3 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -128,10 +128,6 @@ python do_package_ipk () {
128 bb.error("DEPLOY_DIR_IPK not defined, unable to package") 128 bb.error("DEPLOY_DIR_IPK not defined, unable to package")
129 return 129 return
130 130
131 arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
132 outdir = "%s/%s" % (outdir, arch)
133 bb.mkdirhier(outdir)
134
135 dvar = bb.data.getVar('D', d, 1) 131 dvar = bb.data.getVar('D', d, 1)
136 if not dvar: 132 if not dvar:
137 bb.error("D not defined, unable to package") 133 bb.error("D not defined, unable to package")
@@ -174,7 +170,8 @@ python do_package_ipk () {
174 170
175 bb.data.update_data(localdata) 171 bb.data.update_data(localdata)
176 basedir = os.path.join(os.path.dirname(root)) 172 basedir = os.path.join(os.path.dirname(root))
177 pkgoutdir = outdir 173 arch = bb.data.getVar('PACKAGE_ARCH', localdata, 1)
174 pkgoutdir = "%s/%s" % (outdir, arch)
178 bb.mkdirhier(pkgoutdir) 175 bb.mkdirhier(pkgoutdir)
179 os.chdir(root) 176 os.chdir(root)
180 from glob import glob 177 from glob import glob