From 3056a38eafeee1823fa293b204427ea4cf34e9fc Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 21 Jan 2024 12:59:02 +0000 Subject: [PATCH] git.sh: support downloading dependency trees a tree can specify: tree_depend="treename" this will make the other tree be downloaded. this is used for coreboot trees, to ensure that dependency trees are downloaded, because trees can now re-use crossgcc from other trees. Signed-off-by: Leah Rowe --- config/coreboot/dell/target.cfg | 1 + config/coreboot/fam15h_udimm/target.cfg | 1 + include/git.sh | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/coreboot/dell/target.cfg b/config/coreboot/dell/target.cfg index 32ee7ff..8b2e227 100644 --- a/config/coreboot/dell/target.cfg +++ b/config/coreboot/dell/target.cfg @@ -1,3 +1,4 @@ tree="dell" +tree_depend="default" xtree="default" rev="d862695f5f432b5c78dada5f16c293a4c3f9fce6" diff --git a/config/coreboot/fam15h_udimm/target.cfg b/config/coreboot/fam15h_udimm/target.cfg index 77c6799..06aa17a 100644 --- a/config/coreboot/fam15h_udimm/target.cfg +++ b/config/coreboot/fam15h_udimm/target.cfg @@ -1,4 +1,5 @@ tree="fam15h_udimm" +tree_depend="fam15h_rdimm" xtree="fam15h_rdimm" rev="1c13f8d85c7306213cd525308ee8973e5663a3f8" payload_grub="n" diff --git a/include/git.sh b/include/git.sh index ddbf07b..d2ad725 100755 --- a/include/git.sh +++ b/include/git.sh @@ -4,7 +4,7 @@ # This file is only used by update/project/trees -eval "$(setvars "" _target rev _xm loc url bkup_url depend xtree)" +eval "$(setvars "" _target rev _xm loc url bkup_url depend tree_depend xtree)" fetch_project_trees() { @@ -37,6 +37,8 @@ fetch_config() [ "${_target}" = "${tree}" ] && break _target="${tree}" done + [ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \ + x_ update trees -f "$project" "$tree_depend"; return 0 } load_target_config()