mirror of
git://git.yoctoproject.org/poky.git
synced 2025-08-22 00:42:05 +02:00
0118853b5b
devtool modify/upgrade are not currently equipped to handle conditional local files in SRC_URI, and provide only the main no-override set in a workspace under source/component/oe-local-files/ (this is done via meta/classes/devtool-source.bbclass). On the other hand, updating the changes from workspace into a recipe is run iteratively against all overrides; this works for patches (as they all are directed into their own override branches in the workspace git source tree), but breaks down when trying to match local files in a workspace against local files in overridden SRC_URI lists, resulting in bad recipe breakage. (there's an additional twist here: existing code has a guard against this but the guard relies on metadata in workspace .bbappend that is only there in modify operations, but not upgrades. This commit replaces the guard with a general check that will work everywhere). Implementing multiple sets of local files is significant work; let's for now simply not touch local files in recipes except when on the no-override variant. Also, adjust the selftest cases to include conditional local files in sample recipes, so the situation is covered by the tests. (From OE-Core rev: 4760fac939a6204e3cb7dcd3699cd9a2508f9dee) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 3a8654b860fa98f94e80c3c3fff359ffed14bbe7) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
||
|---|---|---|
| .. | ||
| devtool-patch-overrides | ||
| devtool-test-ignored | ||
| devtool-test-local | ||
| devtool-test-localonly | ||
| devtool-test-long-filename | ||
| devtool-test-patch-gz | ||
| devtool-test-subdir | ||
| devtool-upgrade-test1-1.5.3 | ||
| devtool-patch-overrides.bb | ||
| devtool-test-ignored.bb | ||
| devtool-test-local_6.03.bb | ||
| devtool-test-localonly.bb | ||
| devtool-test-long-filename.bb | ||
| devtool-test-patch-gz.bb | ||
| devtool-test-subdir.bb | ||
| devtool-upgrade-test1_1.5.3.bb | ||
| devtool-upgrade-test1_1.5.3.bb.upgraded | ||
| devtool-upgrade-test2_git.bb | ||
| devtool-upgrade-test2_git.bb.upgraded | ||