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

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 () {
                 bb.error("DEPLOY_DIR_IPK not defined, unable to package")
                 return
 
-        arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
-        outdir = "%s/%s" % (outdir, arch)
-        bb.mkdirhier(outdir)
-
         dvar = bb.data.getVar('D', d, 1)
         if not dvar:
                 bb.error("D not defined, unable to package")
@@ -174,7 +170,8 @@ python do_package_ipk () {
 
                 bb.data.update_data(localdata)
                 basedir = os.path.join(os.path.dirname(root))
-                pkgoutdir = outdir
+                arch = bb.data.getVar('PACKAGE_ARCH', localdata, 1)
+                pkgoutdir = "%s/%s" % (outdir, arch)
                 bb.mkdirhier(pkgoutdir)
                 os.chdir(root)
                 from glob import glob