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

List:       openembedded-core
Subject:    [OE-core] [PATCH 2/3] distrodata.bbclass/distro_check.py: Support -dummy mapping of PN
From:       elizabeth.flanagan () intel ! com (Beth Flanagan)
Date:       2015-03-31 20:11:05
Message-ID: a802fb6d10856ea6ed84e6da0da596f5f1d0fd1d.1427832505.git.elizabeth.flanagan () intel ! com
[Download RAW message or body]

Strip out -dummy in order to map to the base PN of dummy packages

Signed-off-by: Beth Flanagan <elizabeth.flanagan at intel.com>
---
 meta/classes/distrodata.bbclass | 12 ++++++++++++
 meta/lib/oe/distro_check.py     |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 10e59d3..6562c86 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -47,6 +47,10 @@ python do_distrodata_np() {
             pnstripped = pnstripped.split("-initial")[0]
             bb.note("initial Split: %s" % pnstripped)
 
+        if pnstripped.find("-dummy") != -1:
+            pnstripped = pnstripped.split("-dummy")
+            bb.note("dummy Split: %s" % pnstripped)
+
         localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + \
d.getVar('OVERRIDES', True))  bb.data.update_data(localdata)
 
@@ -127,6 +131,10 @@ python do_distrodata() {
             pnstripped = pnstripped.split("-initial")[0]
             bb.note("initial Split: %s" % pnstripped)
 
+        if pnstripped.find("-dummy") != -1:
+            pnstripped = pnstripped.split("-dummy")[0]
+            bb.note("dummy Split: %s" % pnstripped)
+
         localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + \
d.getVar('OVERRIDES', True))  bb.data.update_data(localdata)
 
@@ -293,6 +301,10 @@ python do_checkpkg() {
             pnstripped = pnstripped.split("-initial")[0]
             bb.note("initial Split: %s" % pnstripped)
 
+        if pnstripped.find("-dummy") != -1:
+            pnstripped = pnstripped.split("-dummy")[0]
+            bb.note("dummy Split: %s" % pnstripped)
+
         localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + \
d.getVar('OVERRIDES', True))  bb.data.update_data(localdata)
 
diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py
index f754991..d13783b 100644
--- a/meta/lib/oe/distro_check.py
+++ b/meta/lib/oe/distro_check.py
@@ -279,7 +279,9 @@ def compare_in_distro_packages_list(distro_check_dir, d):
     recipe_name = d.getVar('PN', True)
     bb.note("Checking: %s" % pn)
     pnstripped = pn
-    trim_dict = dict({"-native":"-native", "-cross":"-cross", \
"-crosssdk":"-crosssdk" ,"-initial":"-initial"}) +    trim_dict = \
dict({"-native":"-native", "-cross":"-cross", \ +                      \
"-crosssdk":"-crosssdk" ,"-initial":"-initial", \ +                      \
"-dummy":"-dummy"})  
     if pnstripped.find("-native") != -1:
         pnstripped = pnstripped.split("-native")[0]
@@ -296,6 +298,9 @@ def compare_in_distro_packages_list(distro_check_dir, d):
     if pnstripped.find("-initial") != -1:
         pnstripped = pnstripped.split("-initial")[0]
 
+    if pnstripped.find("-dummy") != -1:
+        pnstripped = pnstripped.split("-dummy")[0]
+
     localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', \
True))  
     bb.data.update_data(localdata)
-- 
1.9.1

-------------------------------------------------------------
Intel Ireland Limited (Branch)
Collinstown Industrial Park, Leixlip, County Kildare, Ireland
Registered Number: E902934

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.


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