diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2025-06-16 11:49:51 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-20 12:07:26 +0100 |
| commit | f59a7df3fe946e2274440275a638a58321842ee9 (patch) | |
| tree | 6cf875056d11cf09d732b52370e1ad015e301af2 /meta-selftest/recipes-test | |
| parent | 724b86c08ad914ee2fcb029b15f151fdf6416e6c (diff) | |
| download | poky-f59a7df3fe946e2274440275a638a58321842ee9.tar.gz | |
meta: remove S in recipes that fetch from git via setting BB_GIT_DEFAULT_DESTSUFFIX
Removing all the S = ${WORKDIR}/git assignments works because BB_GIT_DEFAULT_DESTSUFFIX
is set to match S from bitbake.conf (which itself is set to match typical tarball
releases).
A few recipes are setting S to a sub-directory of the git tree and need
to be adjusted accordingly.
bzip2 recipe is fetching a tarball and separately cloning tests;
adjust the recipe to put the latter into 'bzip2-tests', instead of 'git'.
devupstream.bbclass no longer needs to rewrite S, and is adjusted accordingly.
Adjust scripts/lib/recipetool/append.py to not hardcode 'git' as unpack
destination.
Adjust kernel-yocto.bbclass to use the git unpack variable instead
of hardcoding 'git' (there's also removal of repetition of
string constants and a correction of workdir/unpackdir mismatch in
one of the if-else branches).
Ensure build-appliance-image recipe does not use 'git' as checkout directory for
poky repo, but rather explicitly name it 'poky'.
Ensure reproducible.py code that looks for git repositories does not
hardcode 'git' but uses the destination set by BB_GIT_DEFAULT_DESTSUFFIX.
Ensure recipetool does not write out unneeded S settings into newly
created recipes that fetch from git.
Adjust selftest to not hardcode 'git' as unpack directory.
(From OE-Core rev: f80c07019ddadaf9c5fb890faabfda7920ecd15e)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-selftest/recipes-test')
5 files changed, 0 insertions, 5 deletions
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb index 2558a22ce5..24ca32f86f 100644 --- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb | |||
| @@ -15,7 +15,6 @@ SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master" | |||
| 15 | UPSTREAM_CHECK_COMMITS = "1" | 15 | UPSTREAM_CHECK_COMMITS = "1" |
| 16 | RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature" | 16 | RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature" |
| 17 | 17 | ||
| 18 | S = "${WORKDIR}/git" | ||
| 19 | 18 | ||
| 20 | EXCLUDE_FROM_WORLD = "1" | 19 | EXCLUDE_FROM_WORLD = "1" |
| 21 | 20 | ||
diff --git a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded index eaa8bd898d..63bfed8a7a 100644 --- a/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded +++ b/meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded | |||
| @@ -14,7 +14,6 @@ SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master" | |||
| 14 | UPSTREAM_CHECK_COMMITS = "1" | 14 | UPSTREAM_CHECK_COMMITS = "1" |
| 15 | RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature" | 15 | RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature" |
| 16 | 16 | ||
| 17 | S = "${WORKDIR}/git" | ||
| 18 | 17 | ||
| 19 | EXCLUDE_FROM_WORLD = "1" | 18 | EXCLUDE_FROM_WORLD = "1" |
| 20 | 19 | ||
diff --git a/meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb b/meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb index 90d9b66b2c..055657b239 100644 --- a/meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb +++ b/meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb | |||
| @@ -10,7 +10,6 @@ UPSTREAM_VERSION_UNKNOWN = "1" | |||
| 10 | SRC_URI = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master" | 10 | SRC_URI = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master" |
| 11 | SRCREV = "a2885dd7d25380d23627e7544b7bbb55014b16ee" | 11 | SRCREV = "a2885dd7d25380d23627e7544b7bbb55014b16ee" |
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/git" | ||
| 14 | 13 | ||
| 15 | do_test_git_as_user() { | 14 | do_test_git_as_user() { |
| 16 | cd ${S} | 15 | cd ${S} |
diff --git a/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb index c4806793ee..756c01cb09 100644 --- a/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb +++ b/meta-selftest/recipes-test/gitrepotest/gitrepotest.bb | |||
| @@ -13,4 +13,3 @@ SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protoco | |||
| 13 | 13 | ||
| 14 | SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" | 14 | SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/git" | ||
diff --git a/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc b/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc index 602e895199..59b383800c 100644 --- a/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc +++ b/meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc | |||
| @@ -13,4 +13,3 @@ SRC_URI:append:gitunpack-enable-recipe = ";tag=${TAGVALUE}" | |||
| 13 | SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" | 13 | SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" |
| 14 | SRCREV:gitunpack-enable-recipe = "" | 14 | SRCREV:gitunpack-enable-recipe = "" |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/git" | ||
