[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1560/8267] insane: only check ${S} exists if we had sources to fetch

commit 7d04a4dbfdcc2cadaf453b07e30ef9ced3031f88
Author: Ross Burton <ross burton intel com>
Date:   Thu Jul 21 20:29:27 2016 +0100

    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.
    (From OE-Core rev: 8cba511ab6ea557fab9f7838dfe1fc8284bbdd68)
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/insane.bbclass |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 98381c2..2cb8cc0 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), 

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