[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH] native: fix incorrect addition of -native suffix
From:       ed.bartosh () linux ! intel ! com (Ed Bartosh)
Date:       2015-12-31 17:03:39
Message-ID: 1451581419-30276-1-git-send-email-ed.bartosh () linux ! intel ! com
[Download RAW message or body]

The code in native.bbclass adds -native suffix for recipes that
don't have it. If native package doesn't have this suffix it
will be added to it. For example perl-native-runtime becomes
perl-native-runtime-native because of this.

Added check to -native- in the recipe name to prevent addition
of -native suffix.

Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
 meta/classes/native.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index aac2c1e..8bb3244 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -120,7 +120,7 @@ python native_virtclass_handler () {
         return
 
     pn = e.data.getVar("PN", True)
-    if not pn.endswith("-native"):
+    if not (pn.endswith("-native") or "-native-" in pn):
         return
 
     def map_dependencies(varname, d, suffix = ""):
@@ -136,7 +136,7 @@ python native_virtclass_handler () {
                 continue
             elif "-cross-" in dep:
                 newdeps.append(dep.replace("-cross", "-native"))
-            elif not dep.endswith("-native"):
+            elif not (dep.endswith("-native") or "-native-" in dep):
                 newdeps.append(dep + "-native")
             else:
                 newdeps.append(dep)
-- 
2.1.4


[prev in list] [next in list] [prev in thread] [next in thread]