From cd6138c50b361766bc1daf7dcd5a0b8afb0e8234 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 5 Mar 2012 21:58:57 +0000 Subject: java.bbclass: use bbwarn as oewarn is now unsupported Signed-off-by: Otavio Salvador --- classes/java.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') 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() { # Creates symlinks out of the remaining arguments. while [ "$#" -gt 0 ]; do if [ -e $dir/$1 -o -h $dir/$1 ]; then - oewarn "file was in the way. removing:" $dir/$1 + bbwarn "file was in the way. removing:" $dir/$1 rm $dir/$1 fi ln -s $destname $dir/$1 -- cgit v1.2.3-54-g00ecf From 354c46442aff232b10dafa6cd3347de523f64dd4 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 5 Mar 2012 22:00:00 +0000 Subject: java-library.bbclass: allow for regular packages generation Signed-off-by: Otavio Salvador --- classes/java-library.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index 4396bb3..f1b908a 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass @@ -32,7 +32,7 @@ JPN ?= "${@java_package_name(d)}" DEPENDS_prepend = "virtual/javac-native fastjar-native " -PACKAGES = "${JPN}" +PACKAGES += "${JPN}" PACKAGE_ARCH_${JPN} = "all" -- cgit v1.2.3-54-g00ecf From a6abe2cec3c302eda39e5a724ae14dee002624a5 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 5 Mar 2012 22:00:31 +0000 Subject: java-library.bbclass: do not fully replace do_install with oe_jarinstall Signed-off-by: Otavio Salvador --- classes/java-library.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index f1b908a..52c932c 100644 --- a/classes/java-library.bbclass +++ b/classes/java-library.bbclass @@ -53,6 +53,6 @@ do_removebinaries() { addtask removebinaries after do_unpack before do_patch -do_install() { +do_install_append() { oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES} } -- cgit v1.2.3-54-g00ecf