summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-17 19:55:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-28 23:25:42 +0000
commit65767d35d1569abc2a656970206b97a8d5fd7484 (patch)
treec87b83d0ec055cb97078e045b22388f74e92b590
parent9fb6a66c79d5a421a1feddafd13047c288f3802e (diff)
downloadpoky-65767d35d1569abc2a656970206b97a8d5fd7484.tar.gz
externalsrc: always set SRCPV
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. (From OE-Core rev: 740e3f5e1d4a8abb07c7a4e4aedd804d679c7562) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/externalsrc.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index ea59d02ed9..d200129987 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -73,9 +73,8 @@ python () {
73 73
74 d.setVar('SRC_URI', ' '.join(local_srcuri)) 74 d.setVar('SRC_URI', ' '.join(local_srcuri))
75 75
76 if '{SRCPV}' in d.getVar('PV', False): 76 # Dummy value because the default function can't be called with blank SRC_URI
77 # Dummy value because the default function can't be called with blank SRC_URI 77 d.setVar('SRCPV', '999')
78 d.setVar('SRCPV', '999')
79 78
80 if d.getVar('CONFIGUREOPT_DEPTRACK') == '--disable-dependency-tracking': 79 if d.getVar('CONFIGUREOPT_DEPTRACK') == '--disable-dependency-tracking':
81 d.setVar('CONFIGUREOPT_DEPTRACK', '') 80 d.setVar('CONFIGUREOPT_DEPTRACK', '')