From 964f34b7eedb789cbd55441195cf739756662766 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 1 Dec 2007 18:17:51 +0000 Subject: meta-toolchain: Add a note about the libgcc package problems and factor out a variable name (from poky) --- packages/meta/meta-toolchain.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'packages/meta') diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 92fded00af..991d079fcd 100644 --- 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 -- cgit v1.2.3 From 4bdcce051cee2d1c9c83f77c88a6f68726cedfe0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 1 Dec 2007 19:03:27 +0000 Subject: classes/meta-toolchain: Remove pkgmaps from use using pkgdata to provide all functionality in a multimachine safe way instead (from poky). --- packages/meta/meta-toolchain.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'packages/meta') diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 991d079fcd..8f366001e1 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -62,11 +62,10 @@ do_populate_sdk() { mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host rm -Rf ${SDK_OUTPUT}/usr/lib - # extract and store ipks, pkgdata, pkgmaps and shlibs data + # 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}/pkgmaps/debian/ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ for pkg in $target_pkgs ; do for arch in $revipkgarchs; do @@ -84,9 +83,6 @@ do_populate_sdk() { 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/ fi - if [ -e ${STAGING_DIR}/pkgmaps/debian/$subpkg ]; then - cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/ - fi if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ fi -- cgit v1.2.3