mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
devtool: fix modify with patches in override directories
If a recipe applies patches which are in machine-specific override directories, devtool will fail to fetch the patches that don't match the default configuration. For example where there are patches at qemux86/x86.patch and qemuarm/arm.patch: SRC_URI = "file://source" SRC_URI_append_qemuarm = " file://arm.patch" SRC_URI_append_qemux86 = " file://x86.patch" The patch apply phase sets OVERRIDES but does not set FILESOVERRIDES, so it cannot find the patch files as the search path isn't correct. Fix this by setting FILESOVERRIDES too. Also when iterating through the overrides we need to be sure that other overrides that are used are not enabled, so extend no_overrides instead of simply appending the current override. Fixes most but not all of [ YOCTO #14060 ]. (From OE-Core rev: a372cdf8e175423c47faeecc98ad076ee26bbec8) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d6bc178f33
commit
4a35bcc9d1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user