KIRSKSTONE: overwrite syntax
Signed-off-by: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
This commit is contained in:
1 parent
5e68bca87d
commit
483a6968fa
66 files changed
+551
-552
No files matched your search
@@ -243,8 +243,8 @@ python do_create_multiextlinux_config() {
|
||||
extra_extlinuxlabels = labels
|
||||
extra_cfile = os.path.join(d.getVar('B'), subdir , config + '_' + 'extlinux.conf')
|
||||
# Configure dynamically the default menu configuration if there is no specific one configured
|
||||
if d.getVar('UBOOT_EXTLINUX_DEFAULT_LABEL_%s' % config):
|
||||
bb.note(">>> Specific configuration for UBOOT_EXTLINUX_DEFAULT_LABEL var detected for %s label: %s" % (config, d.getVar('UBOOT_EXTLINUX_DEFAULT_LABEL_%s' % config)))
|
||||
if d.getVar('UBOOT_EXTLINUX_DEFAULT_LABEL:%s' % config):
|
||||
bb.note(">>> Specific configuration for UBOOT_EXTLINUX_DEFAULT_LABEL var detected for %s label: %s" % (config, d.getVar('UBOOT_EXTLINUX_DEFAULT_LABEL:%s' % config)))
|
||||
else:
|
||||
bb.note(">>> Set UBOOT_EXTLINUX_DEFAULT_LABEL to %s" % config)
|
||||
d.setVar('UBOOT_EXTLINUX_DEFAULT_LABEL', config)
|
||||
@@ -266,8 +266,8 @@ python do_create_multiextlinux_config() {
|
||||
if socname_list and len(socname_list.split()) > 0:
|
||||
for soc in socname_list.split():
|
||||
if config.find(soc) > -1:
|
||||
if d.getVar('UBOOT_EXTLINUX_SPLASH_%s' % soc):
|
||||
splash = d.getVar('UBOOT_EXTLINUX_SPLASH_%s' % soc)
|
||||
if d.getVar('UBOOT_EXTLINUX_SPLASH:%s' % soc):
|
||||
splash = d.getVar('UBOOT_EXTLINUX_SPLASH:%s' % soc)
|
||||
bb.note(">>> Specific configuration for SPLASH Screen detected with configuration: %s" % config)
|
||||
bb.note(">>> Set UBOOT_EXTLINUX_SPLASH to %s" % splash)
|
||||
d.setVar('UBOOT_EXTLINUX_SPLASH', splash)
|
||||
@@ -282,8 +282,8 @@ do_create_multiextlinux_config[cleandirs] += "${B}"
|
||||
# Because of local overrides within create_multiextlinux_config() function, we
|
||||
# need to make sure to add each variables to the vardeps list.
|
||||
UBOOT_EXTLINUX_TARGET_VARS = "FIT LABELS BOOTPREFIXES TIMEOUT DEFAULT_LABEL TARGETS_EXTRA_CONFIG"
|
||||
do_create_multiextlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX_%s_%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_TARGET_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_TARGETS').split()])}"
|
||||
do_create_multiextlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX:%s:%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_TARGET_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_TARGETS').split()])}"
|
||||
UBOOT_EXTLINUX_LABELS_VARS = "CONSOLE MENU_DESCRIPTION ROOT KERNEL_IMAGE FDTDIR FDT KERNEL_ARGS INITRD FIT"
|
||||
UBOOT_EXTLINUX_LABELS_CONFIGURED = "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('UBOOT_EXTLINUX_LABELS_%s' % o) for o in d.getVar('UBOOT_EXTLINUX_TARGETS').split()).split()))}"
|
||||
UBOOT_EXTLINUX_LABELS_CONFIGURED += "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_%s' % o) for o in d.getVar('UBOOT_EXTLINUX_TARGETS').split()).split()))}"
|
||||
do_create_multiextlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX_%s_%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_LABELS_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_LABELS_CONFIGURED').split()])}"
|
||||
UBOOT_EXTLINUX_LABELS_CONFIGURED = "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('UBOOT_EXTLINUX_LABELS:%s' % o) for o in d.getVar('UBOOT_EXTLINUX_TARGETS').split()).split()))}"
|
||||
UBOOT_EXTLINUX_LABELS_CONFIGURED += "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:%s' % o) for o in d.getVar('UBOOT_EXTLINUX_TARGETS').split()).split()))}"
|
||||
do_create_multiextlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX:%s:%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_LABELS_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_LABELS_CONFIGURED').split()])}"
|
||||
Reference in new issue
Block a user