summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2020-03-24 16:28:04 -0700
committerMark Hatle <mark.hatle@xilinx.com>2020-03-25 10:48:46 -0700
commit084838649a7ccb645986244a1749eb33334c1dde (patch)
tree1a5b416ecd23fb86a57d86012efefffb17fc1d6a
parent49fa66668b3ce7c72eda3efef8a95d96e2358845 (diff)
downloadmeta-xilinx-084838649a7ccb645986244a1749eb33334c1dde.tar.gz
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 <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-standalone/classes/esw.bbclass2
1 files changed, 1 insertions, 1 deletions
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(){
96 raise bb.parse.SkipRecipe('Recipe is only compatible with xilinx-standalone') 96 raise bb.parse.SkipRecipe('Recipe is only compatible with xilinx-standalone')
97 97
98 import os.path 98 import os.path
99 if bb.data.inherits_class('externalsrc', d) or d.getVar('EXTERNALSRC'): 99 if bb.data.inherits_class('externalsrc', d) and d.getVar('EXTERNALSRC'):
100 externalsrc = d.getVar('EXTERNALSRC') 100 externalsrc = d.getVar('EXTERNALSRC')
101 lic_file = d.getVar('LIC_FILES_CHKSUM', False) 101 lic_file = d.getVar('LIC_FILES_CHKSUM', False)
102 licpath=externalsrc 102 licpath=externalsrc