[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5465/8267] recipe_sanity: Drop now unused FILESDIR



commit a584c181acc23a8e23200a1ef66aa581f2172a3c
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Apr 5 09:33:33 2017 +0100

    recipe_sanity: Drop now unused FILESDIR
    
    FILESDIR is long dead and unreferenced pretty much anywhere now, drop these
    sanity references too.
    
    (From OE-Core rev: 760ab75be6b794fdcd0b1717439fcea605db9e0b)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/recipe_sanity.bbclass |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)
---
diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass
index 3b00b0e..7fa4a84 100644
--- a/meta/classes/recipe_sanity.bbclass
+++ b/meta/classes/recipe_sanity.bbclass
@@ -70,22 +70,6 @@ def can_delete_FILESPATH(cfgdata, d):
             return False
     return expected != unexpanded
 
-def can_delete_FILESDIR(cfgdata, d):
-    expected = cfgdata.get("FILESDIR")
-    #expected = "${@bb.utils.which(d.getVar('FILESPATH'), '.')}"
-    unexpanded = d.getVar("FILESDIR", False)
-    if unexpanded is None:
-        return False
-
-    expanded = os.path.normpath(d.getVar("FILESDIR"))
-    filespath = d.getVar("FILESPATH").split(":")
-    filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)]
-
-    return unexpanded != expected and \
-           os.path.exists(expanded) and \
-           (expanded in filespath or
-            expanded == d.expand(expected))
-
 def can_delete_others(p, cfgdata, d):
     for k in ["S", "PV", "PN", "DESCRIPTION", "DEPENDS",
               "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]:
@@ -112,7 +96,6 @@ python do_recipe_sanity () {
     p = "%s %s %s" % (d.getVar("PN"), d.getVar("PV"), d.getVar("PR"))
 
     sanitychecks = [
-        (can_delete_FILESDIR, "candidate for removal of FILESDIR"),
         (can_delete_FILESPATH, "candidate for removal of FILESPATH"),
         #(can_use_autotools_base, "candidate for use of autotools_base"),
         (incorrect_nonempty_PACKAGES, "native or cross recipe with non-empty PACKAGES"),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]