[PATCH] externalsrc: remove submodule--helper list call

[PATCH] externalsrc: remove submodule--helper list call

[Jacob Creedon]

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

Re: [poky] [PATCH] externalsrc: remove submodule--helper list call

[Peter Kjellerstedt]

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

Re: [poky] [PATCH] externalsrc: remove submodule--helper list call

[Jacob Creedon]

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