]> code.ossystems Code Review - openembedded-core.git/commitdiff
lib/oe/util.py: Add MLPREFIX support to prune_suffix()
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 7 Jun 2011 09:19:41 +0000 (17:19 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 27 Jul 2011 15:15:33 +0000 (16:15 +0100)
prune_suffix() also needs be aware of MLPREFIX when changing PN for
use in BPN.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/utils.py

index 5a63ed3c3b13693e523abe048f78da52d6e6d986..b3473d34762cb68edf39bba788fdc18df3cd11bf 100644 (file)
@@ -58,7 +58,12 @@ def prune_suffix(var, suffixes, d):
     # remove it if found
     for suffix in suffixes:
         if var.endswith(suffix):
-            return var.replace(suffix, "")
+            var = var.replace(suffix, "")
+
+    prefix = d.getVar("MLPREFIX", True)
+    if prefix and var.startswith(prefix):
+        var = var.replace(prefix, "")
+
     return var
 
 def str_filter(f, str, d):