|
@@ -199,6 +199,7 @@ python devtool_post_patch() {
|
|
|
# Run do_patch function with the override applied
|
|
|
localdata = bb.data.createCopy(d)
|
|
|
localdata.setVar('OVERRIDES', ':'.join(no_overrides))
|
|
|
+ localdata.setVar('FILESOVERRIDES', ':'.join(no_overrides))
|
|
|
bb.build.exec_func('do_patch', localdata)
|
|
|
rm_patches()
|
|
|
# Now we need to reconcile the dev branch with the no-overrides one
|
|
@@ -216,7 +217,8 @@ python devtool_post_patch() {
|
|
|
# Reset back to the initial commit on a new branch
|
|
|
bb.process.run('git checkout %s -b devtool-override-%s' % (initial_rev, override), cwd=srcsubdir)
|
|
|
# Run do_patch function with the override applied
|
|
|
- localdata.appendVar('OVERRIDES', ':%s' % override)
|
|
|
+ localdata.setVar('OVERRIDES', ':'.join(no_overrides + [override]))
|
|
|
+ localdata.setVar('FILESOVERRIDES', ':'.join(no_overrides + [override]))
|
|
|
bb.build.exec_func('do_patch', localdata)
|
|
|
rm_patches()
|
|
|
# Now we need to reconcile the new branch with the no-overrides one
|