From 740e3f5e1d4a8abb07c7a4e4aedd804d679c7562 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 17 Dec 2019 19:55:56 +0100 Subject: 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. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/classes/externalsrc.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta') 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 () { 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', '') -- cgit 1.2.3-korg