A fix was made to meta/classes/externalsrc.bbclass that involved adding a check for a .gitmodules file which caused the error that's been addressed. This check failed when trying to bitbake when a git repository has been added to workspace/appends with the "--no-same-dir" flag defined for devtool modify. The problem is that .gitmodules is being searched for in the wrong directory. The file is found but the modified repo isn't a git umbrella so has no submodules. The command following is supposed to change the working directory to "s_dir" but fails because it is expecting to run in a repo with submodules.
Signed-off-by: Tashana Buys <[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 a6a8ca6318..35c0fe0557 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass @@ -229,7 +229,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") - if os.path.exists(".gitmodules"): + if os.path.exists(os.path.join(s_dir, '.gitmodules')): submodule_helper = subprocess.check_output(["git", "config", "--file", ".gitmodules", "--get-regexp", "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]) -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174899): https://lists.openembedded.org/g/openembedded-core/message/174899 Mute This Topic: https://lists.openembedded.org/mt/95801308/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
