summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-07-21 20:29:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-25 23:47:00 +0100
commit8cba511ab6ea557fab9f7838dfe1fc8284bbdd68 (patch)
treee7972e419113a27ac931d181948e8be914011450
parentce24d4c3632b71939ad198268a900ee823a89b27 (diff)
downloadopenembedded-core-contrib-8cba511ab6ea557fab9f7838dfe1fc8284bbdd68.tar.gz
openembedded-core-contrib-8cba511ab6ea557fab9f7838dfe1fc8284bbdd68.tar.bz2
openembedded-core-contrib-8cba511ab6ea557fab9f7838dfe1fc8284bbdd68.zip
insane: only check ${S} exists if we had sources to fetch
Only check that ${S} actually exists if there was something in ${SRC_URI} to fetch, the argument being that if SRC_URI is empty the the recipe won't be using ${S} at all. In general recipes that have no sources can remove the unpack task, but expecting all recipes to do this relatively advanced operation isn't realistic. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/insane.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 98381c20ee..2cb8cc0abf 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1256,10 +1256,9 @@ Missing inherit gettext?""" % (gt, config))
}
python do_qa_unpack() {
- bb.note("Checking has ${S} been created")
-
+ src_uri = d.getVar('SRC_URI', True)
s_dir = d.getVar('S', True)
- if not os.path.exists(s_dir):
+ if src_uri and not os.path.exists(s_dir):
bb.warn('%s: the directory %s (%s) pointed to by the S variable doesn\'t exist - please set S within the recipe to point to where the source has been unpacked to' % (d.getVar('PN', True), d.getVar('S', False), s_dir))
}