fixup! classes/image.bbclass: Fix it when WRTEMPLATE_CONF_WRIMAGE is …

…not defined.
WindRiver-Labs · Apr 12, 2019 · d695cc9 · d695cc9
1 parent 72f5875
commit d695cc9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/classes/image.bbclass b/classes/image.bbclass
@@ -66,5 +66,5 @@ inherit ${@wrlt_next_class(d, 'image')}
 # because they may add or remove from the image variable.
 # Use a neat way to workaround "require ''", otherwise it would be failed when
 # update it in layerindex.
-require ${@[d.getVar('WRTEMPLATE_CONF_WRIMAGE', True) or '', 'wrlnoimage.inc'][(d.getVar('WRTEMPLATE_CONF_WRIMAGE', True) or '') != '' and d.getVar('WRTEMPLATE_IMAGE', True) == '1']}
-require ${@[d.getVar('WRTEMPLATE_CONF_WRIMAGE_MACH', True) or '', 'wrlnoimage_mach.inc'][(d.getVar('WRTEMPLATE_CONF_WRIMAGE_MACH', True) or '') != '' and d.getVar('WRTEMPLATE_IMAGE', True) == '1']}
+require ${@['wrlnoimage.inc', d.getVar('WRTEMPLATE_CONF_WRIMAGE', True) or ''][(d.getVar('WRTEMPLATE_CONF_WRIMAGE', True) or '') != '' and d.getVar('WRTEMPLATE_IMAGE', True) == '1']}
+require ${@['wrlnoimage_mach.inc', d.getVar('WRTEMPLATE_CONF_WRIMAGE_MACH', True) or ''][(d.getVar('WRTEMPLATE_CONF_WRIMAGE_MACH', True) or '') != '' and d.getVar('WRTEMPLATE_IMAGE', True) == '1']}