devtool-source.bbclass: Only create each patch branch once
PATCH v3 1/1 devtool-source.bbclass: Only create each patch branch once
For conditonally applied patches based on SRC_URI overrides, the devtool-source class would try to create a new branch for each override assignment as a postfunc to do_patch, but if the same override was used multiple times, it would try to create the same branch multiple times, causing errors like
Quoted 1 line
Exception: bb.process.ExecutionError: Execution of
\ 'git checkout f0f0f0f0f0ff0f0f0f0f0f0f0f0f0f0f0ff0f0f0 -b devtool-override-foo'
\ failed with exit code 128:
Quoted 1 line
fatal: A branch named 'devtool-override-foo' already exists.
This change makes sure that the devtool-source bbclass will only create one branch per override.
--- meta/classes/devtool-source.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
---
v1 -> v2: Peter Kjellerstedt pointed out some issues with v1; this updated change is simpler. In addition to what Richard said about it causing failures in oe-selftest. I had a issues running oe-selftest, mostly because of the large storage requirements of /tmp and issues with company internal git hooks. I think I managed to run all the tests with passing results now, but please be vigilante of testcase failures; sorry in advance!
v2 -> v3: it seems i can manage to use git send-email/format-patch properly today due to serious pebkac issues, sorry for the spam. Remove change-id and re-add the patch "changelog".
meta/classes/devtool-source.bbclass +3 -3
@@ -183,14 +183,14 @@ python devtool_post_patch() { extra_overrides = d.getVar('DEVTOOL_EXTRA_OVERRIDES') if extra_overrides: - extra_override_list = extra_overrides.split(':') + extra_overrides = set(extra_overrides.split(':')) devbranch = d.getVar('DEVTOOL_DEVBRANCH') default_overrides = d.getVar('OVERRIDES').split(':') no_overrides = [] # First, we may have some overrides that are referred to in the recipe set in # our configuration, so we need to make a branch that excludes those for override in default_overrides: - if override not in extra_override_list: + if override not in extra_overrides: no_overrides.append(override) if default_overrides != no_overrides: # Some overrides are active in the current configuration, so
@@ -208,7 +208,7 @@ python devtool_post_patch() { else: bb.process.run('git checkout %s -b devtool-no-overrides' % devbranch, cwd=srcsubdir) - for override in extra_override_list: + for override in extra_overrides: localdata = bb.data.createCopy(d) if override in default_overrides: bb.process.run('git branch devtool-override-%s %s' % (override, devbranch), cwd=srcsubdir)
Signature · 1 line
2.11.0