From 10e6cc830c75a2fd30f7b0efef84cdf614198cfa Mon Sep 17 00:00:00 2001 From: Anton Almqvist Date: Wed, 12 Jun 2024 04:39:07 +0200 Subject: devtool: modify: Catch git submodule error for go code One of the git submodule commands failed for source extracted for recipes using go.bbclass. The root cause is probably the path set up by go_do_unpack which makes S and gitroot not match. This patch does not fix the root problem, but at least it is no worse than before the git submodule support. The extracted source will still have two .git folders, one in S created by devtool and one in the go path which will contain the tru git history. [ YOCTO #15483 ] (From OE-Core rev: 1dc639353658496db5c5df802c0259e87fe2ca0f) Signed-off-by: Anton Almqvist Signed-off-by: Ola x Nilsson Signed-off-by: Richard Purdie (cherry picked from commit fe242408af40dd1f6e47d9b2b232bdc76756c80a) Signed-off-by: Peter Kjellerstedt Signed-off-by: Steve Sakoman --- scripts/lib/devtool/standard.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts/lib/devtool/standard.py') diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 10d0cd3b7c..2beb058de8 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -893,7 +893,10 @@ def modify(args, config, basepath, workspace): (stdout, _) = bb.process.run('git rev-list --reverse %s..HEAD' % initial_revs["."], cwd=srctree) commits["."] = stdout.split() check_commits = True - (stdout, _) = bb.process.run('git submodule --quiet foreach --recursive \'echo `git rev-parse devtool-base` $PWD\'', cwd=srctree) + try: + (stdout, _) = bb.process.run('git submodule --quiet foreach --recursive \'echo `git rev-parse devtool-base` $PWD\'', cwd=srctree) + except bb.process.ExecutionError: + stdout = "" for line in stdout.splitlines(): (rev, submodule_path) = line.split() submodule = os.path.relpath(submodule_path, srctree) -- cgit v1.2.3-54-g00ecf