summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-01-13 21:54:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-17 22:10:11 +0000
commit4cd1118a090f69a7d050cd69da798af55e2b41b1 (patch)
tree6961a8ff1bb6f9bdbe5713f213ef0d8336dcb4eb
parentdca67e0bc61e7bc40c628fb1f1a41f7f756bb0bc (diff)
downloadpoky-4cd1118a090f69a7d050cd69da798af55e2b41b1.tar.gz
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.bbclass7
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() {
25 src="$1" 25 src="$1"
26 dest="$2" 26 dest="$2"
27 27
28 sysroot_stage_dir $src $dest
29
28 olddir=`pwd` 30 olddir=`pwd`
29 cd $src 31 cd $dest
30 las=$(find . -name \*.la -type f) 32 las=$(find . -name \*.la -type f)
31 cd $olddir 33 cd $olddir
32 echo "Found la files: $las" 34 echo "Found la files: $las"
@@ -36,9 +38,8 @@ sysroot_stage_libdir() {
36 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ 38 -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
37 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ 39 -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
38 -e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${STAGING_DIR_HOST}${base_libdir},g" \ 40 -e "/^dependency_libs=/s,\([[:space:]']\)${base_libdir},\1${STAGING_DIR_HOST}${base_libdir},g" \
39 -i $src/$i 41 -i $dest/$i
40 done 42 done
41 sysroot_stage_dir $src $dest
42} 43}
43 44
44sysroot_stage_dirs() { 45sysroot_stage_dirs() {