On Thu, 2022-09-15 at 16:06 -0700, Jacob Creedon via lists.openembedded.org wrote: > This removes a call to an undocumented and now deprecated subcommand of > git submodule--helper and replaces it with a suppoorted one that gives an > equivalent list. > > Signed-off-by: Jacob Creedon <[email protected]> > --- > 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):
I put this into our CI and it failed: https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/4136 https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/4079 https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/4094 https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/4150 https://autobuilder.yoctoproject.org/typhoon/#/builders/127/builds/132 which I could reproduce locally with: "oe-selftest -r devtool.DevtoolAddTests.test_devtool_add_fetch_git" I'd also note that your patch is line wrapped and your From address is being mangled by the mailing list, probably due to DMARC issues. If you could fix those for the new version that'd be great! Cheers, Richard
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#170794): https://lists.openembedded.org/g/openembedded-core/message/170794 Mute This Topic: https://lists.openembedded.org/mt/93712209/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
