summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/syslinux.bbclass10
1 files changed, 3 insertions, 7 deletions
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 2f5b6c43d7..ea07e23828 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -126,13 +126,11 @@ python build_syslinux_cfg () {
126 cfgfile.write('DISPLAY %s\n' % (mfile.split('/')[-1]) ) 126 cfgfile.write('DISPLAY %s\n' % (mfile.split('/')[-1]) )
127 127
128 for label in labels.split(): 128 for label in labels.split():
129 from copy import deepcopy 129 localdata = bb.data.createCopy(d)
130 localdata = deepcopy(d)
131 130
132 overrides = bb.data.getVar('OVERRIDES', localdata) 131 overrides = bb.data.getVar('OVERRIDES', localdata, True)
133 if not overrides: 132 if not overrides:
134 raise bb.build.FuncFailed('OVERRIDES not defined') 133 raise bb.build.FuncFailed('OVERRIDES not defined')
135 overrides = bb.data.expand(overrides, localdata)
136 134
137 bb.data.setVar('OVERRIDES', label + ':' + overrides, localdata) 135 bb.data.setVar('OVERRIDES', label + ':' + overrides, localdata)
138 bb.data.update_data(localdata) 136 bb.data.update_data(localdata)
@@ -149,8 +147,6 @@ python build_syslinux_cfg () {
149 cfgfile.write('initrd=initrd ') 147 cfgfile.write('initrd=initrd ')
150 148
151 cfgfile.write('%s\n' % (append)) 149 cfgfile.write('%s\n' % (append))
152 150
153 del localdata
154
155 cfgfile.close() 151 cfgfile.close()
156} 152}