]> code.ossystems Code Review - openembedded-core.git/commitdiff
externalsrc: always set SRCPV
authorAlexander Kanavin <alex.kanavin@gmail.com>
Tue, 17 Dec 2019 18:55:56 +0000 (19:55 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 28 Dec 2019 23:25:35 +0000 (23:25 +0000)
If devupstream is in use by the recipe, then that
variant has SRCPV, but the main variant may not,
in which case bitbake throws an expansion error.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/externalsrc.bbclass

index ea59d02ed932d71d95edcbcb768be4424ad8e003..d2001299876aaf5ffd0e8bbf9d0c771fc8287a7f 100644 (file)
@@ -73,9 +73,8 @@ python () {
 
         d.setVar('SRC_URI', ' '.join(local_srcuri))
 
-        if '{SRCPV}' in d.getVar('PV', False):
-            # Dummy value because the default function can't be called with blank SRC_URI
-            d.setVar('SRCPV', '999')
+        # Dummy value because the default function can't be called with blank SRC_URI
+        d.setVar('SRCPV', '999')
 
         if d.getVar('CONFIGUREOPT_DEPTRACK') == '--disable-dependency-tracking':
             d.setVar('CONFIGUREOPT_DEPTRACK', '')