* [PATCH] externalsrc: remove submodule--helper list call
@ 2022-09-15 21:25 Jacob Creedon
2022-09-15 21:45 ` [poky] " Peter Kjellerstedt
0 siblings, 1 reply; 3+ messages in thread
From: Jacob Creedon @ 2022-09-15 21:25 UTC (permalink / raw)
To: poky
This removes a call to an undocumented and now deprecated subcommand of
submodule--helper and replaces it with a supported command that gives an
equivalent list.
Signed-off-by: Jacob Creedon <jcreedon@google.com>
---
meta/classes/externalsrc.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 3d6b80bee2..0401c75fa9 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -217,7 +217,7 @@ 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")
+ submodule_helper = subprocess.check_output(['git',
'submodule', '--quiet', 'foreach', 'echo $sm_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):
--
2.37.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [poky] [PATCH] externalsrc: remove submodule--helper list call
2022-09-15 21:25 [PATCH] externalsrc: remove submodule--helper list call Jacob Creedon
@ 2022-09-15 21:45 ` Peter Kjellerstedt
2022-09-15 21:58 ` Jacob Creedon
0 siblings, 1 reply; 3+ messages in thread
From: Peter Kjellerstedt @ 2022-09-15 21:45 UTC (permalink / raw)
To: jcreedon, poky
This patch should be sent to openembedded-core@lists.openembedded.org instead.
> -----Original Message-----
> From: poky@lists.yoctoproject.org <poky@lists.yoctoproject.org> On Behalf Of Jacob Creedon
> Sent: den 15 september 2022 22:26
> To: poky@lists.yoctoproject.org
> Subject: [poky] [PATCH] externalsrc: remove submodule--helper list call
>
> This removes a call to an undocumented and now deprecated subcommand of
> submodule--helper and replaces it with a supported command that gives an
I would change "submodule--helper" to "git submodule--helper" to make it
clear that you are talking about a git subcommand.
//Peter
> equivalent list.
>
> Signed-off-by: Jacob Creedon <jcreedon@google.com>
> ---
> meta/classes/externalsrc.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
> index 3d6b80bee2..0401c75fa9 100644
> --- a/meta/classes/externalsrc.bbclass
> +++ b/meta/classes/externalsrc.bbclass
> @@ -217,7 +217,7 @@ 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")
> + submodule_helper = subprocess.check_output(['git', 'submodule', '--quiet', 'foreach', 'echo $sm_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):
> --
> 2.37.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [poky] [PATCH] externalsrc: remove submodule--helper list call
2022-09-15 21:45 ` [poky] " Peter Kjellerstedt
@ 2022-09-15 21:58 ` Jacob Creedon
0 siblings, 0 replies; 3+ messages in thread
From: Jacob Creedon @ 2022-09-15 21:58 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: poky
On Thu, Sep 15, 2022 at 2:45 PM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> This patch should be sent to openembedded-core@lists.openembedded.org instead.
Whoops, thanks!
> I would change "submodule--helper" to "git submodule--helper" to make it
> clear that you are talking about a git subcommand.
Done
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-15 21:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-15 21:25 [PATCH] externalsrc: remove submodule--helper list call Jacob Creedon
2022-09-15 21:45 ` [poky] " Peter Kjellerstedt
2022-09-15 21:58 ` Jacob Creedon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).