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/base.bbclass | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index b50bc8667c..071acfa015 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -157,6 +157,23 @@ def base_both_contain(variable1, variable2, checkvalue, d):
 
 DEPENDS_prepend="${@base_dep_prepend(d)} "
 
+# Returns PN with various suffixes removed
+# or PN if no matching suffix was found.
+def base_package_name(d):
+  import bb;
+
+  pn = bb.data.getVar('PN', d, 1)
+  if pn.endswith("-native"):
+		pn = pn[0:-7]
+  elif pn.endswith("-cross"):
+		pn = pn[0:-6]
+  elif pn.endswith("-initial"):
+		pn = pn[0:-8]
+  elif pn.endswith("-intermediate"):
+		pn = pn[0:-13]
+
+  return pn
+
 def base_set_filespath(path, d):
 	import os, bb
 	filespath = []
-- 
cgit v1.2.3


From 419924e8e4f5a48be37ea8f59c89a96315178856 Mon Sep 17 00:00:00 2001
From: Robert Schuster <thebohemian@openembedded.org>
Date: Wed, 22 Oct 2008 14:51:32 +0200
Subject: base.bbclass: Add BPN- and BP-based search path to FILESPATH.

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

(limited to 'classes/base.bbclass')

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 071acfa015..93a76aa30f 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -184,7 +184,7 @@ def base_set_filespath(path, d):
 			filespath.append(os.path.join(p, o))
 	return ":".join(filespath)
 
-FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
+FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}"
 
 def oe_filter(f, str, d):
 	from re import match
-- 
cgit v1.2.3