[oe-commits] org.oe.dev meta-toolchain: apply some bits of #2393, still incomplete

[koen commit]

meta-toolchain: apply some bits of #2393, still incomplete

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

#
# mt diff -rb531370cdea16dc78f27a38fef281cf69d49b838 -rb7811bc1aec7b4308a59826a8d0e46fbb72c5211
#
# 
# 
# patch "packages/meta/meta-toolchain.bb"
#  from [f594f8215a980b4238712903ae86c8aaf97f61f2]
#    to [4bdaf02b1b33513f319874f67857a95a27faf6cb]
# 
============================================================
--- packages/meta/meta-toolchain.bb	f594f8215a980b4238712903ae86c8aaf97f61f2
+++ packages/meta/meta-toolchain.bb	4bdaf02b1b33513f319874f67857a95a27faf6cb
@@ -22,25 +22,31 @@ RDEPENDS = "${TARGET_INSTALL} ${HOST_INS
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
-do_populate_sdk() {
-	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}
+sdk_ipk_do_indexes () {
+        set -ex
+        rootfs_ipk_do_indexes
+        set +ex
+}
 
+do_populate_sdk() {
+        sdk_ipk_do_indexes
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
+        echo "Creating host.conf..."
+
 	cat <<EOF >${SDK_DIR}/ipkg-host.conf
-src oe file:${DEPLOY_DIR_IPK}
+src oe file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}
 arch ${BUILD_ARCH} 1
 EOF
-        cat <<EOF >${SDK_DIR}/ipkg-target.conf
-src oe file:${DEPLOY_DIR_IPK}
-EOF
-	ipkgarchs="${PACKAGE_ARCHS}"
+        echo "done."
         priority=1
         for arch in $ipkgarchs; do
                 echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf
-	        priority=$(expr $priority + 5)
+                priority=$(expr $priority + 5)
+                if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
+                        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf
+                fi
         done
 
 	rm -r ${SDK_OUTPUT}