diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-10-03 09:33:16 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-03 17:37:24 +0100 |
| commit | ae9dbd0e1e26ba2b35cbd08ec731aee62adedc23 (patch) | |
| tree | f8cb72d546a0f9c1c3b5e2ebfbac5eb3ccbf3e00 | |
| parent | c26542eb4e8707b9639ec309a44809a728839db8 (diff) | |
| download | openembedded-core-ae9dbd0e1e26ba2b35cbd08ec731aee62adedc23.tar.gz openembedded-core-ae9dbd0e1e26ba2b35cbd08ec731aee62adedc23.tar.bz2 openembedded-core-ae9dbd0e1e26ba2b35cbd08ec731aee62adedc23.zip | |
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
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/distrodata.bbclass | 25 | ||||
| -rw-r--r-- | meta/lib/oe/distro_check.py | 6 |
2 files changed, 25 insertions, 6 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 945ff5344c..69bcc35d44 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass @@ -33,12 +33,6 @@ python do_distrodata_np() { localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) - if pn.find("nativesdk-") != -1: - pnstripped = pn.replace("nativesdk-", "") - bb.note("Native Split: %s" % pnstripped) - localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True)) - bb.data.update_data(localdata) - if pn.find("-cross") != -1: pnstripped = pn.split("-cross") bb.note("cross Split: %s" % pnstripped) @@ -51,6 +45,13 @@ python do_distrodata_np() { localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) + if pn.startswith("nativesdk-"): + pnstripped = pn.replace("nativesdk-", "") + bb.note("NativeSDK Split: %s" % pnstripped) + localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True)) + bb.data.update_data(localdata) + + if pn.find("-initial") != -1: pnstripped = pn.split("-initial") bb.note("initial Split: %s" % pnstripped) @@ -119,12 +120,24 @@ python do_distrodata() { localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) + if pn.startswith("nativesdk-"): + pnstripped = pn.replace("nativesdk-", "") + bb.note("NativeSDK Split: %s" % pnstripped) + localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True)) + bb.data.update_data(localdata) + if pn.find("-cross") != -1: pnstripped = pn.split("-cross") bb.note("cross Split: %s" % pnstripped) localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) bb.data.update_data(localdata) + if pn.find("-crosssdk") != -1: + pnstripped = pn.split("-crosssdk") + bb.note("cross Split: %s" % pnstripped) + localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) + bb.data.update_data(localdata) + if pn.find("-initial") != -1: pnstripped = pn.split("-initial") bb.note("initial Split: %s" % pnstripped) diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py index 455135e650..ad13d5e492 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): bb.data.update_data(localdata) recipe_name = pnstripped[0] + if pn.startswith("nativesdk-"): + pnstripped = pn.split("nativesdk-") + localdata.setVar('OVERRIDES', "pn-" + pnstripped[1] + ":" + d.getVar('OVERRIDES', True)) + bb.data.update_data(localdata) + recipe_name = pnstripped[1] + if pn.find("-cross") != -1: pnstripped = pn.split("-cross") localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES', True)) |