[oe-commits] org.oe.dev rootfs_ipk/package-index: created function to update deploy dirs and made package-index use it

[hrw commit]

rootfs_ipk/package-index: created function to update deploy dirs and made package-index use it

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 77c944a33cf18e3290d63c31f8c10ec748a6f29d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=77c944a33cf18e3290d63c31f8c10ec748a6f29d
Files:
1
classes/rootfs_ipk.bbclass
packages/meta/package-index.bb
Diffs:

#
# mt diff -r16a968c316482dadcd060dfd45bcff40b5766ad6 -r77c944a33cf18e3290d63c31f8c10ec748a6f29d
#
# 
# 
# patch "classes/rootfs_ipk.bbclass"
#  from [a6acd0c7a8d28ff84de316180c4bc1c33d838cf0]
#    to [04170b3871e0f3e177c162f74e50408afb735a0f]
# 
# patch "packages/meta/package-index.bb"
#  from [910f9972cb9510bba3879cb9fdab25bd12ec41fd]
#    to [4f33564e2d11f46b7975676e5901b225190d4920]
# 
============================================================
--- classes/rootfs_ipk.bbclass	a6acd0c7a8d28ff84de316180c4bc1c33d838cf0
+++ classes/rootfs_ipk.bbclass	04170b3871e0f3e177c162f74e50408afb735a0f
@@ -13,10 +13,8 @@ PACKAGE_INSTALL += "ipkg ipkg-collateral
 
 PACKAGE_INSTALL += "ipkg ipkg-collateral"
 
-fakeroot rootfs_ipk_do_rootfs () {
+rootfs_ipk_do_indexes () {
 	set -x
-		
-	mkdir -p ${IMAGE_ROOTFS}/dev
 
 	ipkgarchs="${PACKAGE_ARCHS}"
 
@@ -33,14 +31,22 @@ fakeroot rootfs_ipk_do_rootfs () {
 			fi
 		fi
 	done
+}
 
+fakeroot rootfs_ipk_do_rootfs () {
+	set -x
+
+	rootfs_ipk_do_indexes
+
+	mkdir -p ${IMAGE_ROOTFS}/dev
 	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}"
 
-        for arch in $ipkgarchs; do
+	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
============================================================
--- packages/meta/package-index.bb	910f9972cb9510bba3879cb9fdab25bd12ec41fd
+++ packages/meta/package-index.bb	4f33564e2d11f46b7975676e5901b225190d4920
@@ -1,13 +1,13 @@ LICENSE = "MIT"
 DESCRIPTION = "Rebuild the package index"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 
-DEPENDS = "ipkg-utils-native"
-
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = "1"
 PACKAGES = ""
 
+inherit rootfs_ipk
+
 do_fetch() {
 }
 do_unpack() {
@@ -27,17 +27,6 @@ do_build() {
 do_build[dirs] = "${DEPLOY_DIR_IPK}"
 do_build() {
 	set -ex
-	touch Packages
-	ipkg-make-index -r Packages -p Packages -l Packages.filelist -m .
-
-	ipkgarchs="${PACKAGE_ARCHS}"
-
-        for arch in $ipkgarchs; do
-            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
-        done
-
-        set +ex
+	rootfs_ipk_do_indexes
+	set +ex
 }