summaryrefslogtreecommitdiff
path: root/config/git/grub
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-22 02:35:25 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-22 13:44:27 +0100
commitfc7ae3e5903c176584cfefd6d3cf4c1549c4eaaa (patch)
treed13789beaaa3c1215607dda17fada1b322b5db49 /config/git/grub
parentad1602569ebf1404c47fb8ea4b39d0f8e844b840 (diff)
lib.sh: more unified config handling
replace it with logic that simply uses "." to load files directly. for this, "vcfg" is added as a variable in coreboot target.cfg files, referring to a directory in config/vendor/ containing a file named pkg.cfg, and this file then contains the same variables as the erstwhile config/vendor/sources config/git files are now directories, also containing pkg.cfg files each with the same variables as before, such as repository link and commit hash this change results in a noticeable reduction in code complexity within the build system. unified reading of config files: new function setcfg() added to lib.sh setcfg checks if a config exists. if a 2nd argument is passed, it is used as a return value for eval, otherwise a string calling err is passed. setcfg output is passed through eval, to set strings based on config; eval must be used, so that the variables are set within the same scope, otherwise they'd be set within setcfg which could lead to some whacky results. there's still a bit more more to do, but this single change results in a substantial reduction in code complexity. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'config/git/grub')
-rw-r--r--config/git/grub6
-rw-r--r--config/git/grub/pkg.cfg3
2 files changed, 3 insertions, 6 deletions
diff --git a/config/git/grub b/config/git/grub
deleted file mode 100644
index 21634cd6..00000000
--- a/config/git/grub
+++ /dev/null
@@ -1,6 +0,0 @@
-{grub}{
- rev: HEAD
- loc: grub/grub
- url: git://git.savannah.gnu.org/grub.git
- bkup_url: https://codeberg.org/libreboot/grub
-}
diff --git a/config/git/grub/pkg.cfg b/config/git/grub/pkg.cfg
new file mode 100644
index 00000000..ed26a766
--- /dev/null
+++ b/config/git/grub/pkg.cfg
@@ -0,0 +1,3 @@
+rev="HEAD"
+url="git://git.savannah.gnu.org/grub.git"
+bkup_url="https://codeberg.org/libreboot/grub"