]> code.ossystems Code Review - openembedded-core.git/commit
devtool: fix modify with patches in override directories
authorRoss Burton <ross@burtonini.com>
Thu, 28 Oct 2021 08:05:37 +0000 (10:05 +0200)
committerSteve Sakoman <steve@sakoman.com>
Fri, 29 Oct 2021 14:48:40 +0000 (04:48 -1000)
commitb20699229671ef37daac8b0ed1133aacb477f6a0
tree68396fe630727cce388859c4ef9202a8d10363d3
parent590de1dd89cfd5f0ca7395880ba88b27ee35470d
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>
(cherry picked from commit 4a35bcc9d164ac038a31356a15a0f61ccdd38be2)
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/devtool-source.bbclass