diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-19 12:09:21 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-19 12:09:21 +0100 |
commit | a811131e69de69b2bd57cf1f637b28b507ef1e2a (patch) | |
tree | e5b4dd9cffbbe385dd29a72b9b710ab6206f7b5e /meta | |
parent | 514afcbb8251ce0bf9a30163fa70ef822cc2bc7b (diff) | |
download | poky-a811131e69de69b2bd57cf1f637b28b507ef1e2a.tar.gz |
base.bbclass: Update to work with systems where install won't overwrite files
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index e801fd12a9..3704cce01a 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -342,6 +342,7 @@ oe_libinstall() { | |||
342 | __runcmd install -d $destpath/ | 342 | __runcmd install -d $destpath/ |
343 | dota=$libname.a | 343 | dota=$libname.a |
344 | if [ -f "$dota" -o -n "$require_static" ]; then | 344 | if [ -f "$dota" -o -n "$require_static" ]; then |
345 | rm -f $destpath/$dota | ||
345 | __runcmd install -m 0644 $dota $destpath/ | 346 | __runcmd install -m 0644 $dota $destpath/ |
346 | fi | 347 | fi |
347 | if [ -f "$dotlai" -a -n "$libtool" ]; then | 348 | if [ -f "$dotlai" -a -n "$libtool" ]; then |
@@ -355,6 +356,7 @@ oe_libinstall() { | |||
355 | -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ | 356 | -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \ |
356 | $dotlai >$destpath/$libname.la | 357 | $dotlai >$destpath/$libname.la |
357 | else | 358 | else |
359 | rm -f $destpath/$libname.la | ||
358 | __runcmd install -m 0644 $dotlai $destpath/$libname.la | 360 | __runcmd install -m 0644 $dotlai $destpath/$libname.la |
359 | fi | 361 | fi |
360 | fi | 362 | fi |
@@ -370,6 +372,7 @@ oe_libinstall() { | |||
370 | __runcmd cp -P "$f" $destpath/ | 372 | __runcmd cp -P "$f" $destpath/ |
371 | elif [ ! -L "$f" ]; then | 373 | elif [ ! -L "$f" ]; then |
372 | libfile="$f" | 374 | libfile="$f" |
375 | rm -f $destpath/$libfile | ||
373 | __runcmd install -m 0755 $libfile $destpath/ | 376 | __runcmd install -m 0755 $libfile $destpath/ |
374 | fi | 377 | fi |
375 | done | 378 | done |