diff options
| author | Marcin Juszkiewicz <marcin@buglabs.net> | 2009-11-05 15:37:36 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-11-05 15:40:26 +0100 |
| commit | 4270cb2928afa95117bde026244fb877ee8e2a6e (patch) | |
| tree | 04a1b425b2ffa108e9bbc57086c0861a7aa5c697 /classes/java.bbclass | |
| parent | 12c4514ab0a0e20b69ae81d09e320a1737fdb265 (diff) | |
java.bbclass: fixed oe_jarinstall for broken symlinks
Code checked for existance of JAR file and if it was present then it had
to be removed before symlinking to it. But it was not working sometimes
so we forced symlinking.
Proper fix is to check "does file exists or is a symlink" which we do
now.
Signed-off-by: Marcin Juszkiewicz <marcin@buglabs.net>
Diffstat (limited to 'classes/java.bbclass')
| -rw-r--r-- | classes/java.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/java.bbclass b/classes/java.bbclass index cacd2ce525..b68035c13e 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -68,11 +68,11 @@ oe_jarinstall() { # Creates symlinks out of the remaining arguments. while [ "$#" -gt 0 ]; do - if [ -e $dir/$1 ]; then + if [ -e $dir/$1 -o -h $dir/$1 ]; then oewarn "file was in the way. removing:" $dir/$1 rm $dir/$1 fi - ln -sf $destname $dir/$1 + ln -s $destname $dir/$1 shift done } |