From 1dc36e94fc67ae9e2dc2c15074c2a324b98ed22f Mon Sep 17 00:00:00 2001 From: isa Date: Mon, 15 Jul 2024 18:02:59 -0400 Subject: [PATCH] Build citadel-tools from the same git repo owner as citadel --- .../recipes-core/citadel-tools/citadel-tools_0.1.0.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb b/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb index c6af5fd..027ab88 100644 --- a/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb +++ b/meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb @@ -10,7 +10,14 @@ inherit cargo systemd gsettings pkgconfig # SRCREV = "421b0e27d777c418a26016bd8065715823504637" -GIT_URI = "git://git.subgraph.com/brl/citadel-tools.git;protocol=https;branch=master" +# get git repo owner from citadel to find the correct citadel-tools repo path +python () { + import subprocess + git_owner = subprocess.check_output(['git', 'remote', 'get-url', 'origin']).strip().decode('utf-8').split('/')[0].split(':')[1] + d.setVar("GIT_REPO_OWNER", git_owner) +} + +GIT_URI = "git://git.subgraph.com/${GIT_REPO_OWNER}/citadel-tools.git;protocol=https;branch=master" # If Cargo.lock changes in citadel-tools, this needs to be updated. # cargo bitbake does not support workspaces so as a workaround first