Steve, please cherry-pick this to Scarthgap. //Peter
> -----Original Message----- > From: [email protected] > <[email protected]> On Behalf Of Ola x Nilsson > Sent: den 14 maj 2024 11:56 > To: [email protected] > Cc: Ola x Nilsson <[email protected]> > Subject: [OE-core] [PATCH] devtool: modify: Catch git submodule error for go > code > > From: Anton Almqvist <[email protected]> > > 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 ] > > Signed-off-by: Anton Almqvist <[email protected]> > Signed-off-by: Ola x Nilsson <[email protected]> > --- > scripts/lib/devtool/standard.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py > index bd009f44b1..05161942b7 100644 > --- a/scripts/lib/devtool/standard.py > +++ b/scripts/lib/devtool/standard.py > @@ -904,7 +904,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) > -- > 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#199423): https://lists.openembedded.org/g/openembedded-core/message/199423 Mute This Topic: https://lists.openembedded.org/mt/106091660/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
