* [dunfell] [PATCH] externalsrc: git submodule--helper list unsupported
@ 2022-10-06 9:22 Sven Schwermer
2022-10-06 9:30 ` [OE-core] " Michael Opdenacker
[not found] ` <171B70EA61BB4E6A.13650@lists.openembedded.org>
0 siblings, 2 replies; 4+ messages in thread
From: Sven Schwermer @ 2022-10-06 9:22 UTC (permalink / raw)
To: openembedded-core; +Cc: John Edward Broadbent, Carson Labrado, Richard Purdie
From: John Edward Broadbent <jebr@google.com>
Git has removed support for "git submodule--helper list".
https://github.com/git/git/commit/31955475d1c283120d5d84247eb3fd55d9f5fdd9
This change provides an alternate method for gathering the submodules
information.
Tested:
Build recipes with and without submodules
Signed-off-by: Carson Labrado <clabrado@google.com>
Signed-off-by: John Edward Broadbent <jebr@google.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6d9364e5f3535954f65cbbc694ee7933ac1d664f)
---
Notes:
With git 2.38.0 externalsrc does not work anymore. I hope, we can
backport this fix to stable branches as well.
meta/classes/externalsrc.bbclass | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 0e0a3ae89c..291fcf5653 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -225,15 +225,16 @@ def srctree_hash_files(d, srcdir=None):
env['GIT_INDEX_FILE'] = tmp_index.name
subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env)
git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8")
- submodule_helper = subprocess.check_output(['git', 'submodule--helper', 'list'], cwd=s_dir, env=env).decode("utf-8")
- for line in submodule_helper.splitlines():
- module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1])
- if os.path.isdir(module_dir):
- proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
- proc.communicate()
- proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
- stdout, _ = proc.communicate()
- git_sha1 += stdout.decode("utf-8")
+ if os.path.exists(".gitmodules"):
+ submodule_helper = subprocess.check_output(["git", "config", "--file", ".gitmodules", "--get-regexp", "path"], cwd=s_dir, env=env).decode("utf-8")
+ for line in submodule_helper.splitlines():
+ module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1])
+ if os.path.isdir(module_dir):
+ proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+ proc.communicate()
+ proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
+ stdout, _ = proc.communicate()
+ git_sha1 += stdout.decode("utf-8")
sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest()
with open(oe_hash_file, 'w') as fobj:
fobj.write(sha1)
--
2.37.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OE-core] [dunfell] [PATCH] externalsrc: git submodule--helper list unsupported
2022-10-06 9:22 [dunfell] [PATCH] externalsrc: git submodule--helper list unsupported Sven Schwermer
@ 2022-10-06 9:30 ` Michael Opdenacker
[not found] ` <171B70EA61BB4E6A.13650@lists.openembedded.org>
1 sibling, 0 replies; 4+ messages in thread
From: Michael Opdenacker @ 2022-10-06 9:30 UTC (permalink / raw)
To: sven
Cc: John Edward Broadbent, Carson Labrado, Richard Purdie, openembedded-core
Hi Seven,
On 06.10.22 11:22, Sven via lists.openembedded.org wrote:
> From: John Edward Broadbent <jebr@google.com>
>
> Git has removed support for "git submodule--helper list".
> https://github.com/git/git/commit/31955475d1c283120d5d84247eb3fd55d9f5fdd9
>
> This change provides an alternate method for gathering the submodules
> information.
>
> Tested:
> Build recipes with and without submodules
>
> Signed-off-by: Carson Labrado <clabrado@google.com>
> Signed-off-by: John Edward Broadbent <jebr@google.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (cherry picked from commit 6d9364e5f3535954f65cbbc694ee7933ac1d664f)
> ---
>
> Notes:
> With git 2.38.0 externalsrc does not work anymore. I hope, we can
> backport this fix to stable branches as well.
>
> meta/classes/externalsrc.bbclass | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
> index 0e0a3ae89c..291fcf5653 100644
> --- a/meta/classes/externalsrc.bbclass
> +++ b/meta/classes/externalsrc.bbclass
Thanks for the patch, but it doesn't apply.
I guess you should re-apply to the openembedded-core repository first,
which has different paths.
Thanks again
Michael.
--
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [OE-core] [dunfell] [PATCH] externalsrc: git submodule--helper list unsupported
[not found] ` <171B70EA61BB4E6A.13650@lists.openembedded.org>
@ 2022-10-06 9:31 ` Michael Opdenacker
2022-10-06 9:35 ` Michael Opdenacker
1 sibling, 0 replies; 4+ messages in thread
From: Michael Opdenacker @ 2022-10-06 9:31 UTC (permalink / raw)
To: sven
Cc: John Edward Broadbent, Carson Labrado, Richard Purdie, openembedded-core
Hi again Sven
On 06.10.22 11:30, Michael Opdenacker via lists.openembedded.org wrote:
> Hi Seven,
Sorry for the typo on your name!
Michael.
--
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [OE-core] [dunfell] [PATCH] externalsrc: git submodule--helper list unsupported
[not found] ` <171B70EA61BB4E6A.13650@lists.openembedded.org>
2022-10-06 9:31 ` Michael Opdenacker
@ 2022-10-06 9:35 ` Michael Opdenacker
1 sibling, 0 replies; 4+ messages in thread
From: Michael Opdenacker @ 2022-10-06 9:35 UTC (permalink / raw)
To: sven
Cc: John Edward Broadbent, Carson Labrado, Richard Purdie, openembedded-core
On 06.10.22 11:30, Michael Opdenacker via lists.openembedded.org wrote:
>
> Thanks for the patch, but it doesn't apply.
> I guess you should re-apply to the openembedded-core repository first,
> which has different paths.
My bad, it does apply indeed to the "dunfell" branch.
Apologies for the noise
Michael.
--
Michael Opdenacker, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-06 9:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-06 9:22 [dunfell] [PATCH] externalsrc: git submodule--helper list unsupported Sven Schwermer
2022-10-06 9:30 ` [OE-core] " Michael Opdenacker
[not found] ` <171B70EA61BB4E6A.13650@lists.openembedded.org>
2022-10-06 9:31 ` Michael Opdenacker
2022-10-06 9:35 ` Michael Opdenacker
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.