summaryrefslogtreecommitdiff
path: root/classes/java-library.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'classes/java-library.bbclass')
-rw-r--r--classes/java-library.bbclass26
1 files changed, 4 insertions, 22 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index eced939ef0..5ce0537dd5 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;
@@ -25,18 +28,6 @@ def java_package_name(d):
return pre + pn + post
-def java_base_package_name(d):
- import bb;
-
- pre=""
- post=""
-
- pn = bb.data.getVar('PN', d, 1)
- if pn.endswith("-native"):
- pn = pn[0:-7]
-
- return pn
-
JPN ?= "${@java_package_name(d)}"
DEPENDS_prepend = "virtual/javac-native fastjar-native "
@@ -47,12 +38,6 @@ PACKAGE_ARCH_${JPN} = "all"
FILES_${JPN} = "${datadir_java}"
-# Base package name
-# Automatically derives "foo" from "foo-native"
-BPN ?= ""${@java_base_package_name(d)}""
-
-BP ?= "${BPN}-${PV}"
-
# File name of the libraries' main Jar file
JARFILENAME = "${BP}.jar"
@@ -74,12 +59,9 @@ java_install() {
do_install() {
java_install
+ java_stage
}
java_stage() {
oe_jarinstall -s ${JARFILENAME} ${ALTJARFILENAMES}
}
-
-do_stage() {
- java_stage
-}