diff options
Diffstat (limited to 'meta/classes/devtool-source.bbclass')
-rw-r--r-- | meta/classes/devtool-source.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass index 67cd0bafb2..1372e32c9e 100644 --- a/meta/classes/devtool-source.bbclass +++ b/meta/classes/devtool-source.bbclass | |||
@@ -183,14 +183,14 @@ python devtool_post_patch() { | |||
183 | 183 | ||
184 | extra_overrides = d.getVar('DEVTOOL_EXTRA_OVERRIDES') | 184 | extra_overrides = d.getVar('DEVTOOL_EXTRA_OVERRIDES') |
185 | if extra_overrides: | 185 | if extra_overrides: |
186 | extra_override_list = extra_overrides.split(':') | 186 | extra_overrides = set(extra_overrides.split(':')) |
187 | devbranch = d.getVar('DEVTOOL_DEVBRANCH') | 187 | devbranch = d.getVar('DEVTOOL_DEVBRANCH') |
188 | default_overrides = d.getVar('OVERRIDES').split(':') | 188 | default_overrides = d.getVar('OVERRIDES').split(':') |
189 | no_overrides = [] | 189 | no_overrides = [] |
190 | # First, we may have some overrides that are referred to in the recipe set in | 190 | # First, we may have some overrides that are referred to in the recipe set in |
191 | # our configuration, so we need to make a branch that excludes those | 191 | # our configuration, so we need to make a branch that excludes those |
192 | for override in default_overrides: | 192 | for override in default_overrides: |
193 | if override not in extra_override_list: | 193 | if override not in extra_overrides: |
194 | no_overrides.append(override) | 194 | no_overrides.append(override) |
195 | if default_overrides != no_overrides: | 195 | if default_overrides != no_overrides: |
196 | # Some overrides are active in the current configuration, so | 196 | # Some overrides are active in the current configuration, so |
@@ -208,7 +208,7 @@ python devtool_post_patch() { | |||
208 | else: | 208 | else: |
209 | bb.process.run('git checkout %s -b devtool-no-overrides' % devbranch, cwd=srcsubdir) | 209 | bb.process.run('git checkout %s -b devtool-no-overrides' % devbranch, cwd=srcsubdir) |
210 | 210 | ||
211 | for override in extra_override_list: | 211 | for override in extra_overrides: |
212 | localdata = bb.data.createCopy(d) | 212 | localdata = bb.data.createCopy(d) |
213 | if override in default_overrides: | 213 | if override in default_overrides: |
214 | bb.process.run('git branch devtool-override-%s %s' % (override, devbranch), cwd=srcsubdir) | 214 | bb.process.run('git branch devtool-override-%s %s' % (override, devbranch), cwd=srcsubdir) |