On 10/01/2012 09:03 AM, Phil Blundell wrote:
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.

Signed-off-by: Phil Blundell <ph...@gnu.org>
---
  meta/classes/recipe_sanity.bbclass |    9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/meta/classes/recipe_sanity.bbclass 
b/meta/classes/recipe_sanity.bbclass
index c3bd0d2..bf378ea 100644
--- a/meta/classes/recipe_sanity.bbclass
+++ b/meta/classes/recipe_sanity.bbclass
@@ -13,7 +13,7 @@ def bad_runtime_vars(cfgdata, d):
              __note("%s should be %s_${PN}" % (var, var), d)

  __recipe_sanity_reqvars = "DESCRIPTION"
-__recipe_sanity_reqdiffvars = "LICENSE"
+__recipe_sanity_reqdiffvars = ""
  def req_vars(cfgdata, d):
      for var in d.getVar("__recipe_sanity_reqvars", True).split():
          if not d.getVar(var, 0):
@@ -23,11 +23,6 @@ def req_vars(cfgdata, d):
          val = d.getVar(var, 0)
          cfgval = cfgdata.get(var)

-        # Hardcoding is bad, but I'm lazy.  We don't care about license being
-        # unset if the recipe has no sources!
-        if var == "LICENSE" and d.getVar("SRC_URI", True) == 
cfgdata.get("SRC_URI"):
-            continue
-
          if not val:
              __note("%s should be set" % var, d)
          elif val == cfgval:
@@ -93,7 +88,7 @@ def can_remove_FILESDIR(cfgdata, d):
              expanded == d.expand(expected))

  def can_remove_others(p, cfgdata, d):
-    for k in ["S", "PV", "PN", "DESCRIPTION", "LICENSE", "DEPENDS",
+    for k in ["S", "PV", "PN", "DESCRIPTION", "DEPENDS",
                "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]:
      #for k in cfgdata:
          unexpanded = d.getVar(k, 0)


Merged into OE-Core

Thanks
        Sau!


_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to