diff options
author | Phil Blundell <philb@gnu.org> | 2012-10-01 17:03:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-18 12:13:39 +0100 |
commit | 2b5acdc0bc8412974ce38abe8e4dc75363cbfaf5 (patch) | |
tree | 44bc8f88e5ecd19e52f5a3aa17c9ebd18de74561 | |
parent | 36d4dcfe6a3ad937caaae299923ae79b918520e1 (diff) | |
download | poky-2b5acdc0bc8412974ce38abe8e4dc75363cbfaf5.tar.gz |
recipe_sanity: Don't bother checking LICENSE
Since e3d7890cace71b0a57d2530bf615a58dcb46d96f or so, base.bbclass has
considered invalid LICENSE settings to be a fatal error. This means we
will never see them so there is no point checking for that.
(From OE-Core rev: e2d71503847f72f55666143a2a320925838fd26f)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/recipe_sanity.bbclass | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass index c3bd0d2a4c..bf378eafc1 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass | |||
@@ -13,7 +13,7 @@ def bad_runtime_vars(cfgdata, d): | |||
13 | __note("%s should be %s_${PN}" % (var, var), d) | 13 | __note("%s should be %s_${PN}" % (var, var), d) |
14 | 14 | ||
15 | __recipe_sanity_reqvars = "DESCRIPTION" | 15 | __recipe_sanity_reqvars = "DESCRIPTION" |
16 | __recipe_sanity_reqdiffvars = "LICENSE" | 16 | __recipe_sanity_reqdiffvars = "" |
17 | def req_vars(cfgdata, d): | 17 | def req_vars(cfgdata, d): |
18 | for var in d.getVar("__recipe_sanity_reqvars", True).split(): | 18 | for var in d.getVar("__recipe_sanity_reqvars", True).split(): |
19 | if not d.getVar(var, 0): | 19 | if not d.getVar(var, 0): |
@@ -23,11 +23,6 @@ def req_vars(cfgdata, d): | |||
23 | val = d.getVar(var, 0) | 23 | val = d.getVar(var, 0) |
24 | cfgval = cfgdata.get(var) | 24 | cfgval = cfgdata.get(var) |
25 | 25 | ||
26 | # Hardcoding is bad, but I'm lazy. We don't care about license being | ||
27 | # unset if the recipe has no sources! | ||
28 | if var == "LICENSE" and d.getVar("SRC_URI", True) == cfgdata.get("SRC_URI"): | ||
29 | continue | ||
30 | |||
31 | if not val: | 26 | if not val: |
32 | __note("%s should be set" % var, d) | 27 | __note("%s should be set" % var, d) |
33 | elif val == cfgval: | 28 | elif val == cfgval: |
@@ -93,7 +88,7 @@ def can_remove_FILESDIR(cfgdata, d): | |||
93 | expanded == d.expand(expected)) | 88 | expanded == d.expand(expected)) |
94 | 89 | ||
95 | def can_remove_others(p, cfgdata, d): | 90 | def can_remove_others(p, cfgdata, d): |
96 | for k in ["S", "PV", "PN", "DESCRIPTION", "LICENSE", "DEPENDS", | 91 | for k in ["S", "PV", "PN", "DESCRIPTION", "DEPENDS", |
97 | "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: | 92 | "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: |
98 | #for k in cfgdata: | 93 | #for k in cfgdata: |
99 | unexpanded = d.getVar(k, 0) | 94 | unexpanded = d.getVar(k, 0) |