diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
| commit | 6fe9490eac7366d9da691d4129b8d2d23f19a139 (patch) | |
| tree | 46a8cdc9a72a8c414a7824225bd76ec8c241fbdb /classes/java-library.bbclass | |
| parent | 3836ac00385216dd47d89ec3cebc12e5446feef9 (diff) | |
| parent | ca7e39e27802da8aecf68d74166ec0d2117c8c70 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/java-library.bbclass')
| -rw-r--r-- | classes/java-library.bbclass | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass index eced939ef0..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; @@ -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" |