summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Marko <peter.marko@siemens.com>2022-12-01 15:04:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-23 23:05:50 +0000
commita11a62209e4bf7af4b1fab7e0069a95bd58aeb5d (patch)
tree5986c586d84db8e1641fad0daa482e37582b066d
parentb627db0656353f0addd9ec122febaef9466dc458 (diff)
downloadpoky-a11a62209e4bf7af4b1fab7e0069a95bd58aeb5d.tar.gz
externalsrc: fix lookup for .gitmodules
Commit 0533edac277080e1bd130c14df0cbac61ba01a0c broke bitbake parsing when bitbake is executed from directory with existing .gitmodules and the recipe in externalsrc does not have .gitmodules The check needs to search for .gitmodules in sources path, not cwd. iParsing recipes...ERROR: ExpansionError during parsing <path to recipe> ... bb.data_smart.ExpansionError: Failure expanding variable do_compile[file-checksums], expression was ${@srctree_hash_files(d)} which triggered exception CalledProcessError: Command '['git', 'config', '--file', '.gitmodules', '--get-regexp', 'path']' returned non-zero exit status 1. (From OE-Core rev: 1f3b39c4d6828940934a341e9f8b73214dc67fdf) Signed-off-by: Peter Marko <peter.marko@siemens.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 66ff3d1f65cd2e7f5319e98fa41f47a59b714c72) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/externalsrc.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index a6a8ca6318..57135f2e4c 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -229,7 +229,7 @@ def srctree_hash_files(d, srcdir=None):
229 env['GIT_INDEX_FILE'] = tmp_index.name 229 env['GIT_INDEX_FILE'] = tmp_index.name
230 subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env) 230 subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env)
231 git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8") 231 git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8")
232 if os.path.exists(".gitmodules"): 232 if os.path.exists(os.path.join(s_dir, ".gitmodules")):
233 submodule_helper = subprocess.check_output(["git", "config", "--file", ".gitmodules", "--get-regexp", "path"], cwd=s_dir, env=env).decode("utf-8") 233 submodule_helper = subprocess.check_output(["git", "config", "--file", ".gitmodules", "--get-regexp", "path"], cwd=s_dir, env=env).decode("utf-8")
234 for line in submodule_helper.splitlines(): 234 for line in submodule_helper.splitlines():
235 module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1]) 235 module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1])