diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-05 09:33:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-05 23:22:11 +0100 |
commit | a584c181acc23a8e23200a1ef66aa581f2172a3c (patch) | |
tree | 0b63371ad5e9212f9a6c6130c872fb44522bb943 /meta/classes/recipe_sanity.bbclass | |
parent | 23340365022cae4b2f18a47cd6105a3d7043e760 (diff) | |
download | poky-a584c181acc23a8e23200a1ef66aa581f2172a3c.tar.gz |
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>
Diffstat (limited to 'meta/classes/recipe_sanity.bbclass')
-rw-r--r-- | 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 3b00b0e521..7fa4a849ea 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass | |||
@@ -70,22 +70,6 @@ def can_delete_FILESPATH(cfgdata, d): | |||
70 | return False | 70 | return False |
71 | return expected != unexpanded | 71 | return expected != unexpanded |
72 | 72 | ||
73 | def can_delete_FILESDIR(cfgdata, d): | ||
74 | expected = cfgdata.get("FILESDIR") | ||
75 | #expected = "${@bb.utils.which(d.getVar('FILESPATH'), '.')}" | ||
76 | unexpanded = d.getVar("FILESDIR", False) | ||
77 | if unexpanded is None: | ||
78 | return False | ||
79 | |||
80 | expanded = os.path.normpath(d.getVar("FILESDIR")) | ||
81 | filespath = d.getVar("FILESPATH").split(":") | ||
82 | filespath = [os.path.normpath(f) for f in filespath if os.path.exists(f)] | ||
83 | |||
84 | return unexpanded != expected and \ | ||
85 | os.path.exists(expanded) and \ | ||
86 | (expanded in filespath or | ||
87 | expanded == d.expand(expected)) | ||
88 | |||
89 | def can_delete_others(p, cfgdata, d): | 73 | def can_delete_others(p, cfgdata, d): |
90 | for k in ["S", "PV", "PN", "DESCRIPTION", "DEPENDS", | 74 | for k in ["S", "PV", "PN", "DESCRIPTION", "DEPENDS", |
91 | "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: | 75 | "SECTION", "PACKAGES", "EXTRA_OECONF", "EXTRA_OEMAKE"]: |
@@ -112,7 +96,6 @@ python do_recipe_sanity () { | |||
112 | p = "%s %s %s" % (d.getVar("PN"), d.getVar("PV"), d.getVar("PR")) | 96 | p = "%s %s %s" % (d.getVar("PN"), d.getVar("PV"), d.getVar("PR")) |
113 | 97 | ||
114 | sanitychecks = [ | 98 | sanitychecks = [ |
115 | (can_delete_FILESDIR, "candidate for removal of FILESDIR"), | ||
116 | (can_delete_FILESPATH, "candidate for removal of FILESPATH"), | 99 | (can_delete_FILESPATH, "candidate for removal of FILESPATH"), |
117 | #(can_use_autotools_base, "candidate for use of autotools_base"), | 100 | #(can_use_autotools_base, "candidate for use of autotools_base"), |
118 | (incorrect_nonempty_PACKAGES, "native or cross recipe with non-empty PACKAGES"), | 101 | (incorrect_nonempty_PACKAGES, "native or cross recipe with non-empty PACKAGES"), |