]> code.ossystems Code Review - openembedded-core.git/commit
devtool: fix modify with patches in override directories
authorRoss Burton <ross@burtonini.com>
Wed, 7 Oct 2020 18:21:52 +0000 (19:21 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 8 Oct 2020 07:08:28 +0000 (08:08 +0100)
commita372cdf8e175423c47faeecc98ad076ee26bbec8
treeb7197ced49fe4efbe7d21e0eb8928f5137f08575
parentad89c3254cc6c06026f1bebe23ec3717c1546633
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 ].

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/devtool-source.bbclass