coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-12 22:42:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib.sh: more unified config handling

Browse Source 
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>
This commit is contained in:
Leah Rowe
2024-06-22 02:35:25 +01:00
parent ad1602569e
commit fc7ae3e590
83 changed files with 190 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/coreboot/dell9020mt_nri_12mb/target.cfg
+1
View File
@@ -5,3 +5,4 @@ payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
grubtree="xhci"
vcfg="haswell"
config/coreboot/dell9020sff_nri_12mb/target.cfg
+1
View File
@@ -5,3 +5,4 @@ payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
grubtree="xhci"
vcfg="haswell"
config/coreboot/e5420_6mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
config/coreboot/e5520_6mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
config/coreboot/e5530_12mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/e6400_4mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="e6400"
config/coreboot/e6400nvidia_4mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="e6400"
config/coreboot/e6420_10mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
config/coreboot/e6430_12mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/e6520_10mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
config/coreboot/e6530_12mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/hp2170p_16mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp2170p"
config/coreboot/hp2560p_8mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp2560p"
config/coreboot/hp2570p_16mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp2570p"
config/coreboot/hp8200sff_4mb/target.cfg
+1
View File
@@ -5,3 +5,4 @@ payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
grubtree="nvme"
vcfg="hp8200sff"
config/coreboot/hp8200sff_8mb/target.cfg
+1
View File
@@ -5,3 +5,4 @@ payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
grubtree="nvme"
vcfg="hp8200sff"
config/coreboot/hp820g2_12mb/target.cfg
+1
View File
@@ -6,3 +6,4 @@ payload_memtest="y"
release="n"
grub_scan_disk="nvme ahci"
grubtree="xhci"
vcfg="hp820g2"
config/coreboot/hp8300cmt_16mb/target.cfg
+1
View File
@@ -5,3 +5,4 @@ payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
grubtree="nvme"
vcfg="ivybridge"
config/coreboot/hp8300usdt_16mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/hp8460pintel_8mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp8460pintel"
config/coreboot/hp8470pintel_16mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp8470pintel"
config/coreboot/hp8560w_8mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp8560w"
config/coreboot/hp9470m_16mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="hp9470m"
config/coreboot/t1650_12mb/target.cfg
+1
View File
@@ -5,3 +5,4 @@ payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
grubtree="nvme"
vcfg="t1650"
config/coreboot/t420_8mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
config/coreboot/t420s_8mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
config/coreboot/t430_12mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/t440plibremrc_12mb/target.cfg
+1
View File
@@ -5,3 +5,4 @@ payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
grubtree="xhci"
vcfg="haswell"
config/coreboot/t520_8mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
config/coreboot/t530_12mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/w530_12mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/w541_12mb/target.cfg
+1
View File
@@ -5,3 +5,4 @@ payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="nvme ahci"
grubtree="xhci"
vcfg="haswell"
config/coreboot/x220_8mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="sandybridge"
config/coreboot/x230_12mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/x230_16mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/x230t_12mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"
config/coreboot/x230t_16mb/target.cfg
+1
View File
@@ -4,3 +4,4 @@ payload_seabios="y"
payload_seabios_withgrub="y"
payload_memtest="y"
grub_scan_disk="ahci"
vcfg="ivybridge"