summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJohn Edward Broadbent <jebr@google.com>2022-09-28 11:58:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-29 21:15:50 +0100
commit0533edac277080e1bd130c14df0cbac61ba01a0c (patch)
tree7ee0e8b787947a6dcdcc5f4abe2076f790c44cf7 /meta
parent18393dc116f59340cd0b5b9315e3d05d461b6027 (diff)
downloadpoky-0533edac277080e1bd130c14df0cbac61ba01a0c.tar.gz
externalsrc: git submodule--helper list unsupported
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 (From OE-Core rev: 6d9364e5f3535954f65cbbc694ee7933ac1d664f) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes-recipe/externalsrc.bbclass19
1 files changed, 10 insertions, 9 deletions
diff --git a/meta/classes-recipe/externalsrc.bbclass b/meta/classes-recipe/externalsrc.bbclass
index ce753fce76..06a9548a20 100644
--- a/meta/classes-recipe/externalsrc.bbclass
+++ b/meta/classes-recipe/externalsrc.bbclass
@@ -230,15 +230,16 @@ def srctree_hash_files(d, srcdir=None):
230 env['GIT_INDEX_FILE'] = tmp_index.name 230 env['GIT_INDEX_FILE'] = tmp_index.name
231 subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env) 231 subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env)
232 git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8") 232 git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8")
233 submodule_helper = subprocess.check_output(['git', 'submodule--helper', 'list'], cwd=s_dir, env=env).decode("utf-8") 233 if os.path.exists(".gitmodules"):
234 for line in submodule_helper.splitlines(): 234 submodule_helper = subprocess.check_output(["git", "config", "--file", ".gitmodules", "--get-regexp", "path"], cwd=s_dir, env=env).decode("utf-8")
235 module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1]) 235 for line in submodule_helper.splitlines():
236 if os.path.isdir(module_dir): 236 module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1])
237 proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) 237 if os.path.isdir(module_dir):
238 proc.communicate() 238 proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
239 proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) 239 proc.communicate()
240 stdout, _ = proc.communicate() 240 proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
241 git_sha1 += stdout.decode("utf-8") 241 stdout, _ = proc.communicate()
242 git_sha1 += stdout.decode("utf-8")
242 sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest() 243 sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest()
243 with open(oe_hash_file, 'w') as fobj: 244 with open(oe_hash_file, 'w') as fobj:
244 fobj.write(sha1) 245 fobj.write(sha1)