meta-toolchain: Add a note about the libgcc package problems and factor out a variabl...

diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 92fded0..991d079 100644 (file)
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -70,10 +70,11 @@ do_populate_sdk() {
        mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/
        for pkg in $target_pkgs ; do
                for arch in $revipkgarchs; do
-                       if [ -e ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ]; then
-                               echo "Found ${DEPLOY_DIR_IPK}/$arch/${pkg}_$arch.ipk"
-                               cp ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/
-                               orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk | grep OE: | cut -d ' ' -f2`
+                       pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk
+                       if [ -e $pkgnames ]; then
+                               echo "Found $pkgnames"
+                               cp $pkgnames ${SDK_OUTPUT}/${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/
@@ -97,6 +98,8 @@ do_populate_sdk() {
 
        # add missing link to libgcc_s.so.1
        # libgcc-dev should be responsible for that, but it's not getting built
+       # RP: it gets smashed up depending on the order that gcc, gcc-cross and 
+       # gcc-cross-sdk get built :( (30/11/07)
        ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so
 
        # remove unwanted executables