diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-01-13 21:54:25 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-17 22:10:11 +0000 |
| commit | 4cd1118a090f69a7d050cd69da798af55e2b41b1 (patch) | |
| tree | 6961a8ff1bb6f9bdbe5713f213ef0d8336dcb4eb | |
| parent | dca67e0bc61e7bc40c628fb1f1a41f7f756bb0bc (diff) | |
| download | openembedded-core-4cd1118a090f69a7d050cd69da798af55e2b41b1.tar.gz openembedded-core-4cd1118a090f69a7d050cd69da798af55e2b41b1.tar.bz2 openembedded-core-4cd1118a090f69a7d050cd69da798af55e2b41b1.zip | |
staging: relocate *.la paths in destination dirs
Keep the la files in source directories unchanged,
and do relocation in destination directories (sysroot-destdir).
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
| -rw-r--r-- | meta/classes/staging.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 843256545f..a7f3258b4a 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -25,8 +25,10 @@ sysroot_stage_libdir() { src="$1" dest="$2" + sysroot_stage_dir $src $dest + olddir=`pwd` - cd $src + cd $dest las=$(find . -name \*.la -type f) cd $olddir echo "Found la files: $las" @@ -36,9 +38,8 @@ sysroot_stage_libdir() { -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ -e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${STAGING_DIR_HOST}${base_libdir},g" \ - -i $src/$i + -i $dest/$i done - sysroot_stage_dir $src $dest } sysroot_stage_dirs() { |