meta-toolchain: Separate out extra files to reduce base toolchain/sdk size

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3603 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 12 insertions, 9 deletions

diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 9ac24bb3aa..40d27b56e1 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -6,6 +6,7 @@ inherit sdk meta
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
+SDK_OUTPUT2 = "${SDK_DIR}/image-extras"
 SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 
 IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
@@ -65,27 +66,27 @@ do_populate_sdk() {
 
         # extract and store ipks, pkgdata and shlibs data
         target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '`
-        mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/
-        mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/
-        mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
+        mkdir -p ${SDK_OUTPUT2}/${prefix}/ipk/
+        mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/runtime/
+        mkdir -p ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/
         for pkg in $target_pkgs ; do
                 for arch in $revipkgarchs; do
                         pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
                         if [ -e $pkgnames ]; then
                                 echo "Found $pkgnames"
-                                cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/
+                                cp $pkgnames ${SDK_OUTPUT2}/${prefix}/ipk/
                                 orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2`
                                 pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}
-                                mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime
-                                cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/
+                                mkdir -p ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime
+                                cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/
                                 subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-`
                                 for subpkg in $subpkgs; do
-                                        cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/
+                                        cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime/
                                         if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then
-                                                cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/
+                                                cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT2}/${prefix}/pkgdata/$pkg_subdir/runtime/
                                         fi
                                         if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then
-                                                cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
+                                                cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT2}/${prefix}/${TARGET_SYS}/shlibs/
                                         fi
                                 done
                                 break
@@ -120,6 +121,8 @@ do_populate_sdk() {
         mkdir -p ${SDK_DEPLOY}
         cd ${SDK_OUTPUT}
         fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
+        cd ${SDK_OUTPUT2}
+        fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}-extras.tar.bz2 .
 }
 
 do_populate_sdk[nostamp] = "1"