diff options
| author | John Lee <john_lee@openmoko.org> | 2008-01-15 15:28:44 +0000 |
|---|---|---|
| committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2008-01-15 15:28:44 +0000 |
| commit | 58e5c1fe677e34b28943452f3acf93be83e737ce (patch) | |
| tree | 02cefa00a00df80d419bb60f619d7c6ffb4c9c83 /packages/meta | |
| parent | 575d1e9c93159b1bc54fc4c7e82673048883fb85 (diff) | |
| parent | 7fbdf8b4dcd7a7a1d596c5c14ac9e2b545b9eff8 (diff) | |
merge of '8996304d45d20965f75c306e6317a0238f26fbf7'
and 'd0954a8a227efc014d29aba8d911adfc59934357'
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/external-toolchain.bb | 2 | ||||
| -rw-r--r-- | packages/meta/meta-toolchain-openmoko.bb | 6 | ||||
| -rw-r--r-- | packages/meta/meta-toolchain.bb | 16 |
3 files changed, 17 insertions, 7 deletions
diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index 47d9a93a15..69f16b10df 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -15,7 +15,7 @@ PROVIDES = "\ virtual/linux-libc-headers \ " -RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" +#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" PACKAGES_DYNAMIC = "glibc-gconv-*" PR = "r1" diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb index 90eff20259..6ee3e0472a 100644 --- a/packages/meta/meta-toolchain-openmoko.bb +++ b/packages/meta/meta-toolchain-openmoko.bb @@ -1,4 +1,6 @@ -TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk" +PR = "r1" -require meta-toolchain.bb +TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" +TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host" +require meta-toolchain.bb diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 91467e5140..4a8edb9c32 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" +PR = "r1" inherit sdk meta @@ -59,8 +60,8 @@ do_populate_sdk() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status - rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + rm -Rf ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host rm -Rf ${SDK_OUTPUT}/usr/lib @@ -73,10 +74,17 @@ do_populate_sdk() { for arch in $revipkgarchs; do pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk if [ -e $pkgnames ]; then - echo "Found $pkgnames" + oenote "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')]} + pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} + for aarch in $revipkgarchs; do + if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then + pkg_subdir="${aarch}${pkg_subdir_postfix}" + break + fi + done + oenote "Original package in ${pkg_subdir}" mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` |