summaryrefslogtreecommitdiffstats
path: root/scripts/lib/recipetool/create.py
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2025-06-16 11:49:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-06-20 12:07:26 +0100
commitf59a7df3fe946e2274440275a638a58321842ee9 (patch)
tree6cf875056d11cf09d732b52370e1ad015e301af2 /scripts/lib/recipetool/create.py
parent724b86c08ad914ee2fcb029b15f151fdf6416e6c (diff)
downloadpoky-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 'scripts/lib/recipetool/create.py')
-rw-r--r--scripts/lib/recipetool/create.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 3c6ef6719f..7080558beb 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -638,7 +638,6 @@ def create_recipe(args):
638 if len(splitline) > 1: 638 if len(splitline) > 1:
639 if splitline[0] == 'origin' and scriptutils.is_src_url(splitline[1]): 639 if splitline[0] == 'origin' and scriptutils.is_src_url(splitline[1]):
640 srcuri = reformat_git_uri(splitline[1]) + ';branch=master' 640 srcuri = reformat_git_uri(splitline[1]) + ';branch=master'
641 srcsubdir = 'git'
642 break 641 break
643 642
644 if args.src_subdir: 643 if args.src_subdir:
@@ -840,7 +839,7 @@ def create_recipe(args):
840 line = line.replace(realpv, '${PV}') 839 line = line.replace(realpv, '${PV}')
841 if pn: 840 if pn:
842 line = line.replace(pn, '${BPN}') 841 line = line.replace(pn, '${BPN}')
843 if line == 'S = "${WORKDIR}/${BPN}-${PV}"': 842 if line == 'S = "${WORKDIR}/${BPN}-${PV}"' or 'tmp-recipetool-' in line:
844 skipblank = True 843 skipblank = True
845 continue 844 continue
846 elif line.startswith('SRC_URI = '): 845 elif line.startswith('SRC_URI = '):