diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/java-library.bbclass | 4 | ||||
-rw-r--r-- | classes/java.bbclass | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index 4396bb3..52c932c 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass | |||
@@ -32,7 +32,7 @@ JPN ?= "${@java_package_name(d)}" | |||
32 | 32 | ||
33 | DEPENDS_prepend = "virtual/javac-native fastjar-native " | 33 | DEPENDS_prepend = "virtual/javac-native fastjar-native " |
34 | 34 | ||
35 | PACKAGES = "${JPN}" | 35 | PACKAGES += "${JPN}" |
36 | 36 | ||
37 | PACKAGE_ARCH_${JPN} = "all" | 37 | PACKAGE_ARCH_${JPN} = "all" |
38 | 38 | ||
@@ -53,6 +53,6 @@ do_removebinaries() { | |||
53 | 53 | ||
54 | addtask removebinaries after do_unpack before do_patch | 54 | addtask removebinaries after do_unpack before do_patch |
55 | 55 | ||
56 | do_install() { | 56 | do_install_append() { |
57 | oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} | 57 | oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} |
58 | } | 58 | } |
diff --git a/classes/java.bbclass b/classes/java.bbclass index 235ab23..464d8a8 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass | |||
@@ -58,7 +58,7 @@ oe_jarinstall() { | |||
58 | # Creates symlinks out of the remaining arguments. | 58 | # Creates symlinks out of the remaining arguments. |
59 | while [ "$#" -gt 0 ]; do | 59 | while [ "$#" -gt 0 ]; do |
60 | if [ -e $dir/$1 -o -h $dir/$1 ]; then | 60 | if [ -e $dir/$1 -o -h $dir/$1 ]; then |
61 | oewarn "file was in the way. removing:" $dir/$1 | 61 | bbwarn "file was in the way. removing:" $dir/$1 |
62 | rm $dir/$1 | 62 | rm $dir/$1 |
63 | fi | 63 | fi |
64 | ln -s $destname $dir/$1 | 64 | ln -s $destname $dir/$1 |