[oe-commits] org.oe.dev meta-sdk-sbox: remove hardcodes references, reuse functions instead of copy-pasting them, and we have an SCM, so no need to comment stuff

[koen commit]

meta-sdk-sbox: remove hardcodes references, reuse functions instead of copy-pasting them, and we have an SCM, so no need to comment stuff

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 33ef958347850ae3830b2326a4476282484717bd
ViewMTN: http://monotone.openembedded.org/revision.psp?id=33ef958347850ae3830b2326a4476282484717bd
Files:
1
packages/meta/meta-sdk-sbox.bb
Diffs:

#
# mt diff -rf02096208403ee8a3236217712d0c435ec59a685 -r33ef958347850ae3830b2326a4476282484717bd
#
# 
# 
# patch "packages/meta/meta-sdk-sbox.bb"
#  from [bd8328179bb2528f501c3250e74bdb50db00a232]
#    to [16b196f2afcb032fef08b7768712b57ecec9e85a]
# 
============================================================
--- packages/meta/meta-sdk-sbox.bb	bd8328179bb2528f501c3250e74bdb50db00a232
+++ packages/meta/meta-sdk-sbox.bb	16b196f2afcb032fef08b7768712b57ecec9e85a
@@ -1,15 +1,14 @@ LICENSE = "MIT"
 DESCRIPTION = "Meta package for a Scratchbox SDK"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 PACKAGES = ""
-PACKAGES = ""
 
-inherit sdk debian
+inherit rootfs_ipk sdk debian
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
-SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
 prefix = "/"
 exec_prefix = "${prefix}"
 base_prefix = "${exec_prefix}"
@@ -28,29 +27,12 @@ IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipk
 
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
-ipk_do_indexes () {
-	set -x
+do_populate_sdk() {
 
-	ipkgarchs="${PACKAGE_ARCHS}"
+        set -ex
+        rootfs_ipk_do_indexes
+        set +ex
 
-        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
-}
-
-do_populate_sdk() {
-	ipk_do_indexes
-
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
@@ -99,9 +81,6 @@ EOF
 
 	# fix pkgconfig data files
 	cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig
-	#for f in *.pc ; do
-	#	sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
-	#done
 	for f in *.pc ; do
 		sed -i 's%${STAGING_DIR}%/usr/%g' "$f"
 	done