summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-10 13:58:46 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-10 13:58:46 +0000
commit539d1d9592ca0cde57ce94e227b63fd1104bb9d5 (patch)
tree5e26366ce67e379eef6df1425b49ec43bcba94b4 /classes
parent4ecbf17b161b54780c26af2c6e90333f8825b013 (diff)
base.bbclass: Replace the base_package_name function with the base_prune_suffix() function from Poky and extend the number of special suffixes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass24
1 files changed, 7 insertions, 17 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index dd48d9229e..aa1037e472 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -202,23 +202,13 @@ DEPENDS_prepend="${@base_dep_prepend(d)} "
DEPENDS_virtclass-native_prepend="${@base_dep_prepend(d)} "
DEPENDS_virtclass-nativesdk_prepend="${@base_dep_prepend(d)} "
-# Returns PN with various suffixes removed
-# or PN if no matching suffix was found.
-def base_package_name(d):
- 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]
- elif pn.endswith("-sdk"):
- pn = pn[0:-4]
-
-
- return pn
+def base_prune_suffix(var, suffixes, d):
+ # See if var ends with any of the suffixes listed and
+ # remove it if found
+ for suffix in suffixes:
+ if var.endswith(suffix):
+ return var.replace(suffix, "")
+ return var
def base_set_filespath(path, d):
bb.note("base_set_filespath usage is deprecated, %s should be fixed" % d.getVar("P", 1))