From 084838649a7ccb645986244a1749eb33334c1dde Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 24 Mar 2020 16:28:04 -0700 Subject: esw.bbclass: Change 'or' to 'and' to verify EXTERNALSRC is defined Issue: CR-1059154 If the externalsrc is enabled, but EXTERNALSRC is not defined this is and invalid configuration. (The externalsrc class already looks for this and errors.) Doing this will ensure that EXTERNALSRC is always defined and we'll avoid any errors related to 'None' values. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/classes/esw.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-xilinx-standalone/classes/esw.bbclass b/meta-xilinx-standalone/classes/esw.bbclass index 754ef337..99b36859 100644 --- a/meta-xilinx-standalone/classes/esw.bbclass +++ b/meta-xilinx-standalone/classes/esw.bbclass @@ -96,7 +96,7 @@ python(){ raise bb.parse.SkipRecipe('Recipe is only compatible with xilinx-standalone') import os.path - if bb.data.inherits_class('externalsrc', d) or d.getVar('EXTERNALSRC'): + if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC'): externalsrc = d.getVar('EXTERNALSRC') lic_file = d.getVar('LIC_FILES_CHKSUM', False) licpath=externalsrc -- cgit v1.2.3-54-g00ecf