package_ipk.bbclass: Split ipk deploy directory by PACKAGE_ARCH (from OE)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2692 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 7 insertions, 0 deletions

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 9e654aac5e..06b161389f 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -101,6 +101,10 @@ package_generate_ipkg_conf () {
                 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
                 echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK}
                 priority=$(expr $priority + 5)
+                if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
+                        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
+                        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_SDK}
+                fi
         done
 }
 
@@ -117,6 +121,9 @@ python do_package_ipk () {
         if not outdir:
                 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)