diff options
| -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() { | |||
| 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 | ||
| 44 | sysroot_stage_dirs() { | 45 | sysroot_stage_dirs() { |
