summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-24 23:08:48 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-24 23:08:48 +0000
commitf3b89a0ed3d08ba880ca111f868c839d33a0aad4 (patch)
tree33a5832f0857b7ce9aa89d48383fb920a0e796c0
parent48c7f7fc85758bad6398b139438ade720724a05e (diff)
downloadopenembedded-core-f3b89a0ed3d08ba880ca111f868c839d33a0aad4.tar.gz
openembedded-core-f3b89a0ed3d08ba880ca111f868c839d33a0aad4.tar.bz2
openembedded-core-f3b89a0ed3d08ba880ca111f868c839d33a0aad4.tar.xz
openembedded-core-f3b89a0ed3d08ba880ca111f868c839d33a0aad4.zip
packages/meta: Remove pkgmaps references
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3226 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/meta/external-poky-toolchain.bb2
-rw-r--r--meta/packages/meta/meta-toolchain.bb16
2 files changed, 6 insertions, 12 deletions
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 9ba6ee031..03b27dbd2 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -27,12 +27,10 @@ do_stage() {
install -d ${DEPLOY_DIR}/ipk/
install -d ${STAGING_DIR}/pkgdata/
- install -d ${STAGING_DIR}/pkgmaps/
install -d ${STAGING_DIR_TARGET}/shlibs/
cp -ar ${prefix}/ipk/* ${DEPLOY_DIR}/ipk/
cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/
- cp -ar ${prefix}/pkgmaps/* ${STAGING_DIR}/pkgmaps/
cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/
}
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 2f913eaef..36e2e3b4d 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/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
@@ -95,7 +92,6 @@ do_populate_sdk() {
done
done
-
# remove unwanted executables
rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc