[oe-commits] org.oe.dev package_ipk, rootfs_ipk: Add patch from Marcin and Koen to sort ipkgs into per architecture subdirs of deploy/ipk

[koen commit]

package_ipk, rootfs_ipk: Add patch from Marcin and Koen to sort ipkgs into per architecture subdirs of deploy/ipk

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: dfe542a129a68cf1ad09b99b69533dacab99aa45
ViewMTN: http://monotone.openembedded.org/revision.psp?id=dfe542a129a68cf1ad09b99b69533dacab99aa45
Files:
1
classes/package_ipk.bbclass
classes/rootfs_ipk.bbclass
Diffs:

#
# mt diff -r72592f37ab450f7086c5c64367f161c2fa9a10b4 -rdfe542a129a68cf1ad09b99b69533dacab99aa45
#
# 
# 
# patch "classes/package_ipk.bbclass"
#  from [6f5d44fb7cf065ce7b680009e5c9bcb554f760c4]
#    to [57535d540caec17311adeb1e15f49d290d6cc8ac]
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [7824b4ee6ac7524e12d7411575e8bbf4b8a9d321]
#    to [a6acd0c7a8d28ff84de316180c4bc1c33d838cf0]
# 
============================================================
--- classes/package_ipk.bbclass	6f5d44fb7cf065ce7b680009e5c9bcb554f760c4
+++ classes/package_ipk.bbclass	57535d540caec17311adeb1e15f49d290d6cc8ac
@@ -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)
============================================================
--- classes/rootfs_ipk.bbclass	7824b4ee6ac7524e12d7411575e8bbf4b8a9d321
+++ classes/rootfs_ipk.bbclass	a6acd0c7a8d28ff84de316180c4bc1c33d838cf0
@@ -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
+	ipkgarchs="${PACKAGE_ARCHS}"
+
+        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
-	ipkgarchs="${PACKAGE_ARCHS}"
-	priority=1
-	for arch in $ipkgarchs; do
+
+        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