On 6/02/21 1:01 pm, Jon Mason wrote:
On Thu, Feb 4, 2021 at 10:43 PM Douglas via lists.openembedded.org
<[email protected]> wrote:
Further to 50ff9afb39, only detect code changes in submodules that are
subdirectories of the EXTERNALSRC directory.
Signed-off-by: Douglas Royds <[email protected]>
---
I believe this patch is causing errors in the autobuilder. See
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1801/steps/14/logs/stdio
Good find by the autobuilder. Earning its money.
This is a git weakness: In this case of a local-files-only recipe,
devtool creates an empty git repository and `git submodule--helper list
path/` fails. Add a file (not even committed), and it works just fine.
Updated patch on its way.
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 64e94e3301..27496bb2db 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -216,7 +216,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--helper',
'list', s_dir], 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])
proc = subprocess.Popen(['git', 'add', '-A', '.'],
cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
--
2.25.1
--
This Communication is Confidential. We only send and receive email on the
basis of the terms set out at www.taitradio.com/email_disclaimer
<http://www.taitradio.com/email_disclaimer>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#147849):
https://lists.openembedded.org/g/openembedded-core/message/147849
Mute This Topic: https://lists.openembedded.org/mt/80398669/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
