1 files changed, 14 insertions, 2 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index b6cb5dcbde..06c3170544 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -10,6 +10,9 @@
 
 inherit java
 
+# use java_stage for native packages
+JAVA_NATIVE_STAGE_INSTALL = "1"
+
 def java_package_name(d):
   import bb;
 
@@ -36,10 +39,19 @@ PACKAGE_ARCH_${JPN} = "all"
 FILES_${JPN} = "${datadir_java}"
 
 # File name of the libraries' main Jar file
-JARFILENAME = "${P}.jar"
+JARFILENAME = "${BP}.jar"
 
 # Space-separated list of alternative file names.
-ALTJARFILENAMES = "${PN}.jar"
+ALTJARFILENAMES = "${BPN}.jar"
+
+# Java "source" distributions often contain precompiled things
+# we want to delete first.
+do_removebinaries() {
+  find ${WORKDIR} -name "*.jar" -exec rm {} \;
+  find ${WORKDIR} -name "*.class" -exec rm {} \;
+}
+
+addtask removebinaries after do_unpack before do_patch
 
 java_install() {
   oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}