diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:06:34 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:06:34 +0000 |
| commit | 0e09147de182aeb96cff9ff59211b3d907ba83f7 (patch) | |
| tree | 004da019bcbfcd9e2325f1855877eca18fc56587 /meta/packages/meta | |
| parent | 19f1bad37806b5e0b4d971d09226eda51345c9d2 (diff) | |
| download | openembedded-core-0e09147de182aeb96cff9ff59211b3d907ba83f7.tar.gz openembedded-core-0e09147de182aeb96cff9ff59211b3d907ba83f7.tar.bz2 openembedded-core-0e09147de182aeb96cff9ff59211b3d907ba83f7.tar.xz openembedded-core-0e09147de182aeb96cff9ff59211b3d907ba83f7.zip | |
Remove hardcoded staging layout assumptions
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3116 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/meta')
| -rw-r--r-- | meta/packages/meta/external-poky-toolchain.bb | 4 | ||||
| -rw-r--r-- | meta/packages/meta/meta-toolchain.bb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb index 87c1ba414..f26e5761f 100644 --- a/meta/packages/meta/external-poky-toolchain.bb +++ b/meta/packages/meta/external-poky-toolchain.bb @@ -28,11 +28,11 @@ do_stage() { install -d ${DEPLOY_DIR}/ipk/ install -d ${STAGING_DIR}/pkgdata/ install -d ${STAGING_DIR}/pkgmaps/ - install -d ${STAGING_DIR}/${TARGET_SYS}/shlibs/ + 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_SYS}/shlibs/ + 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 16e48a0c5..b6705e0a5 100644 --- a/meta/packages/meta/meta-toolchain.bb +++ b/meta/packages/meta/meta-toolchain.bb @@ -91,8 +91,8 @@ do_populate_sdk() { 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_SYS}/shlibs/$subpkg.list ]; then - cp ${STAGING_DIR}/${TARGET_SYS}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ + if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then + cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ fi done break |