Re: RFC: splitting deploy/ipk into subarchs

[Marcin Juszkiewicz <openembedded@hrw.one.pl>]

[-- Attachment #1: Type: text/plain, Size: 677 bytes --]

Dnia poniedziałek, 19 lutego 2007, Koen Kooi napisał:

> When using multimachine and ipkg deploy/ipk gets awfully crowded after
> a while. I want to propose sorting it by subarch. Attached is a patch
> that adds support for that to rootfs_ipk.bbclass.
>
> What do you think about that?

I like this idea. ipkg-make-index is slow enough already.

Attached fixed, tested version of your rootfs_ipk.bbclass change. Also 
added patch to package_ipk.bbclass which will store package in proper 
dir.

-- 
JID: hrw-jabber.org
OpenEmbedded developer/consultant

         Great minds discuss ideas; average minds discuss events;
         small minds discuss people.

[-- Attachment #2: build-rootfs-from-split-ipkdir.diff --]
[-- Type: text/x-diff, Size: 1601 bytes --]

# 
# old_revision [bc83c51286e87a2b8aa3f79f074cadc05dedb7de]
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [7824b4ee6ac7524e12d7411575e8bbf4b8a9d321]
#    to [a30d56a031d7b85d13bb62d4956e77252a4b79fa]
# 
============================================================
--- classes/rootfs_ipk.bbclass	7824b4ee6ac7524e12d7411575e8bbf4b8a9d321
+++ classes/rootfs_ipk.bbclass	a30d56a031d7b85d13bb62d4956e77252a4b79fa
@@ -18,17 +18,25 @@ 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}"
+
+	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}
-	echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
-	ipkgarchs="${PACKAGE_ARCHS}"
 	priority=1
 	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

[-- Attachment #3: store-package-in-proper-ipkdir.diff --]
[-- Type: text/x-diff, Size: 711 bytes --]

# 
# old_revision [bc83c51286e87a2b8aa3f79f074cadc05dedb7de]
# 
# patch "classes/package_ipk.bbclass"
#  from [6f5d44fb7cf065ce7b680009e5c9bcb554f760c4]
#    to [57535d540caec17311adeb1e15f49d290d6cc8ac]
# 
============================================================
--- 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)