From 96c8f0b866225166b435067b29daf2d8c7fb77b1 Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@openembedded.org>
Date: Thu, 16 Oct 2008 11:59:20 +0200
Subject: java-library.bbclass: Remove superfluous quotes from BPN variable.

---
 classes/java-library.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes/java-library.bbclass')

diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index eced939ef0..1e5534cbfe 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -49,7 +49,7 @@ FILES_${JPN} = "${datadir_java}"
 
 # Base package name
 # Automatically derives "foo" from "foo-native"
-BPN ?= ""${@java_base_package_name(d)}""
+BPN ?= "${@java_base_package_name(d)}"
 
 BP ?= "${BPN}-${PV}"
 
-- 
cgit v1.2.3


From 9c991af9e1fb60fafa3c12d31ba87990b410e39f Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@openembedded.org>
Date: Fri, 17 Oct 2008 11:41:20 +0200
Subject: Added BPN/BP functionality (see #11716) base.bbclass: Added
 base_package_name python function. java-library.bbclass: Removed
 java_back_package_name function. bitbake.conf: Set BP/BPN and use it in
 FILESPATH and S

---
 classes/java-library.bbclass | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

(limited to 'classes/java-library.bbclass')

diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index 1e5534cbfe..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"
 
-- 
cgit v1.2.3