summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-10-03 16:33:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-03 16:37:33 (GMT)
commit09aaad16be178bd675750aa6cfe7a373d7c9a8a6 (patch)
tree1d5a1d80254be776c5f3eee64620c34531f30c0e
parent73182ed4ea6d6d8a42acc6c611a0744c27c6d5db (diff)
downloadpoky-09aaad16be178bd675750aa6cfe7a373d7c9a8a6.tar.gz
distrodata: Update distrocheck functions
Fix the distro check functions for the change of nativesdk being a suffix to a prefix. Also added crosssdk as another case for converting to PN for matching in the distro_tracking (From OE-Core rev: ae9dbd0e1e26ba2b35cbd08ec731aee62adedc23) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/distrodata.bbclass25
-rw-r--r--meta/lib/oe/distro_check.py6
2 files changed, 25 insertions, 6 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 945ff53..69bcc35 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -33,12 +33,6 @@ python do_distrodata_np() {
33 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) 33 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True))
34 bb.data.update_data(localdata) 34 bb.data.update_data(localdata)
35 35
36 if pn.find("nativesdk-") != -1:
37 pnstripped = pn.replace("nativesdk-", "")
38 bb.note("Native Split: %s" % pnstripped)
39 localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True))
40 bb.data.update_data(localdata)
41
42 if pn.find("-cross") != -1: 36 if pn.find("-cross") != -1:
43 pnstripped = pn.split("-cross") 37 pnstripped = pn.split("-cross")
44 bb.note("cross Split: %s" % pnstripped) 38 bb.note("cross Split: %s" % pnstripped)
@@ -51,6 +45,13 @@ python do_distrodata_np() {
51 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) 45 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True))
52 bb.data.update_data(localdata) 46 bb.data.update_data(localdata)
53 47
48 if pn.startswith("nativesdk-"):
49 pnstripped = pn.replace("nativesdk-", "")
50 bb.note("NativeSDK Split: %s" % pnstripped)
51 localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True))
52 bb.data.update_data(localdata)
53
54
54 if pn.find("-initial") != -1: 55 if pn.find("-initial") != -1:
55 pnstripped = pn.split("-initial") 56 pnstripped = pn.split("-initial")
56 bb.note("initial Split: %s" % pnstripped) 57 bb.note("initial Split: %s" % pnstripped)
@@ -119,12 +120,24 @@ python do_distrodata() {
119 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) 120 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True))
120 bb.data.update_data(localdata) 121 bb.data.update_data(localdata)
121 122
123 if pn.startswith("nativesdk-"):
124 pnstripped = pn.replace("nativesdk-", "")
125 bb.note("NativeSDK Split: %s" % pnstripped)
126 localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True))
127 bb.data.update_data(localdata)
128
122 if pn.find("-cross") != -1: 129 if pn.find("-cross") != -1:
123 pnstripped = pn.split("-cross") 130 pnstripped = pn.split("-cross")
124 bb.note("cross Split: %s" % pnstripped) 131 bb.note("cross Split: %s" % pnstripped)
125 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) 132 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True))
126 bb.data.update_data(localdata) 133 bb.data.update_data(localdata)
127 134
135 if pn.find("-crosssdk") != -1:
136 pnstripped = pn.split("-crosssdk")
137 bb.note("cross Split: %s" % pnstripped)
138 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True))
139 bb.data.update_data(localdata)
140
128 if pn.find("-initial") != -1: 141 if pn.find("-initial") != -1:
129 pnstripped = pn.split("-initial") 142 pnstripped = pn.split("-initial")
130 bb.note("initial Split: %s" % pnstripped) 143 bb.note("initial Split: %s" % pnstripped)
diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py
index 455135e..ad13d5e 100644
--- a/meta/lib/oe/distro_check.py
+++ b/meta/lib/oe/distro_check.py
@@ -288,6 +288,12 @@ def compare_in_distro_packages_list(distro_check_dir, d):
288 bb.data.update_data(localdata) 288 bb.data.update_data(localdata)
289 recipe_name = pnstripped[0] 289 recipe_name = pnstripped[0]
290 290
291 if pn.startswith("nativesdk-"):
292 pnstripped = pn.split("nativesdk-")
293 localdata.setVar('OVERRIDES', "pn-" + pnstripped[1] + ":" + d.getVar('OVERRIDES', True))
294 bb.data.update_data(localdata)
295 recipe_name = pnstripped[1]
296
291 if pn.find("-cross") != -1: 297 if pn.find("-cross") != -1:
292 pnstripped = pn.split("-cross") 298 pnstripped = pn.split("-cross")
293 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) 299 localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True))