From fc7ae3e5903c176584cfefd6d3cf4c1549c4eaaa Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 22 Jun 2024 02:35:25 +0100 Subject: 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 --- config/coreboot/hp820g2_12mb/target.cfg | 1 + 1 file changed, 1 insertion(+) (limited to 'config/coreboot/hp820g2_12mb/target.cfg') diff --git a/config/coreboot/hp820g2_12mb/target.cfg b/config/coreboot/hp820g2_12mb/target.cfg index ada696cf..6b25ebbb 100644 --- a/config/coreboot/hp820g2_12mb/target.cfg +++ b/config/coreboot/hp820g2_12mb/target.cfg @@ -6,3 +6,4 @@ payload_memtest="y" release="n" grub_scan_disk="nvme ahci" grubtree="xhci" +vcfg="hp820g2" -- cgit v1.2.1