package_ipk, rootfs_ipk: Add patch from Marcin and Koen to sort ipkgs into per archit...

see: http://lists.linuxtogo.org/pipermail/openembedded-devel/2007-February/001462.html

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 4c14409..70bcdf6 100644 (file)
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -75,6 +75,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)

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 03ba5f8..6fc7d8d 100644 (file)
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -18,17 +18,34 @@ fakeroot rootfs_ipk_do_rootfs () {
                
        mkdir -p ${IMAGE_ROOTFS}/dev
 
-       if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
-               touch ${DEPLOY_DIR_IPK}/Packages
-               ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
-       fi
-       mkdir -p ${T}
-       echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
        ipkgarchs="${PACKAGE_ARCHS}"
-       priority=1
+
+        if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+                touch ${DEPLOY_DIR_IPK}/Packages
+                ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+        fi
+
        for arch in $ipkgarchs; do
+               if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+                       if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then 
+                               touch ${DEPLOY_DIR_IPK}/$arch/Packages
+                               ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
+                       fi
+               fi
+       done
+
+       mkdir -p ${T}
+       priority=1
+
+       #Add deploy/ipk as well for backward compat
+       echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
+
+        for arch in $ipkgarchs; do
                echo "arch $arch $priority" >> ${T}/ipkg.conf
                priority=$(expr $priority + 5)
+               if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
+                       echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${T}/ipkg.conf
+           fi
        done
        ipkg-cl ${IPKG_ARGS} update
        if [ ! -z "${LINGUAS_INSTALL}" ]; then