mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

devtool: process local files only for the main branch

Browse Source 
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: 3a8654b860fa98f94e80c3c3fff359ffed14bbe7)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2022-12-30 19:38:50 +01:00
committed by Richard Purdie
parent e73119966a
commit c9c2b6b613
5 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta-selftest/recipes-test/devtool/devtool-test-local/file3 Normal file
View File

@@ -0,0 +1 @@
The third file.

3
meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
View File

@@ -7,9 +7,12 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/syslinux-${PV}.tar.x
file://file1 \
file://file2"
SRC_URI:append:class-native = " file://file3"
SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13"
SRC_URI[sha256sum] = "26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e"
S = "${WORKDIR}/syslinux-${PV}"
EXCLUDE_FROM_WORLD = "1"
BBCLASSEXTEND = "native"

3
meta-selftest/recipes-test/devtool/devtool-test-localonly.bb
View File

@@ -4,4 +4,7 @@ INHIBIT_DEFAULT_DEPS = "1"
SRC_URI = "file://file1 \
file://file2"
SRC_URI:append:class-native = " file://file3"
EXCLUDE_FROM_WORLD = "1"
BBCLASSEXTEND = "native"

1
meta-selftest/recipes-test/devtool/devtool-test-localonly/file3 Normal file
View File

@@ -0,0 +1 @@
The third file.