diff options
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/external-toolchain.bb | 50 | ||||
| -rw-r--r-- | packages/meta/meta-toolchain.bb | 17 |
2 files changed, 58 insertions, 9 deletions
diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb new file mode 100644 index 0000000000..c483ea26a6 --- /dev/null +++ b/packages/meta/external-toolchain.bb @@ -0,0 +1,50 @@ +DESCRIPTION = "This package allows OE to work with an external toolchain generated \ + by meta-toolchain instead of building its own. It expects that toolchain \ + to be located in SDK_PREFIX/prefix." + +PROVIDES = "\ + linux-libc-headers \ + virtual/${TARGET_PREFIX}gcc \ + virtual/${TARGET_PREFIX}gcc-initial \ + virtual/${TARGET_PREFIX}binutils \ + virtual/${TARGET_PREFIX}libc-for-gcc \ + virtual/libc \ + virtual/libintl \ + virtual/libiconv \ + glibc-thread-db \ + virtual/linux-libc-headers \ + " + +RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" +PACKAGES_DYNAMIC = "glibc-gconv-*" +PR = "r1" + +inherit sdk + +do_stage() { + if [ ! -e ${prefix}/package-status ]; then + echo "The external toolchain could not be found in ${prefix}!" + exit 1 + fi + + install -d ${STAGING_DIR}/pkgdata/ + install -d ${STAGING_DIR_TARGET}/shlibs/ + + cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ + cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ + + if [ -d ${prefix}/ipk ]; then + install -d ${DEPLOY_DIR_IPK}/ + cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/ + fi + + if [ -d ${prefix}/deb ]; then + install -d ${DEPLOY_DIR_DEB}/ + cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/ + fi + + if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then + install -d ${DEPLOY_DIR_PSTAGE}/ + cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/ + fi +} diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 92fded00af..8f366001e1 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -62,18 +62,18 @@ 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 - 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/ @@ -83,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 @@ -97,6 +94,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 |