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/dell9020mt_nri_12mb/target.cfg | 1 + config/coreboot/dell9020sff_nri_12mb/target.cfg | 1 + config/coreboot/e5420_6mb/target.cfg | 1 + config/coreboot/e5520_6mb/target.cfg | 1 + config/coreboot/e5530_12mb/target.cfg | 1 + config/coreboot/e6400_4mb/target.cfg | 1 + config/coreboot/e6400nvidia_4mb/target.cfg | 1 + config/coreboot/e6420_10mb/target.cfg | 1 + config/coreboot/e6430_12mb/target.cfg | 1 + config/coreboot/e6520_10mb/target.cfg | 1 + config/coreboot/e6530_12mb/target.cfg | 1 + config/coreboot/hp2170p_16mb/target.cfg | 1 + config/coreboot/hp2560p_8mb/target.cfg | 1 + config/coreboot/hp2570p_16mb/target.cfg | 1 + config/coreboot/hp8200sff_4mb/target.cfg | 1 + config/coreboot/hp8200sff_8mb/target.cfg | 1 + config/coreboot/hp820g2_12mb/target.cfg | 1 + config/coreboot/hp8300cmt_16mb/target.cfg | 1 + config/coreboot/hp8300usdt_16mb/target.cfg | 1 + config/coreboot/hp8460pintel_8mb/target.cfg | 1 + config/coreboot/hp8470pintel_16mb/target.cfg | 1 + config/coreboot/hp8560w_8mb/target.cfg | 1 + config/coreboot/hp9470m_16mb/target.cfg | 1 + config/coreboot/t1650_12mb/target.cfg | 1 + config/coreboot/t420_8mb/target.cfg | 1 + config/coreboot/t420s_8mb/target.cfg | 1 + config/coreboot/t430_12mb/target.cfg | 1 + config/coreboot/t440plibremrc_12mb/target.cfg | 1 + config/coreboot/t520_8mb/target.cfg | 1 + config/coreboot/t530_12mb/target.cfg | 1 + config/coreboot/w530_12mb/target.cfg | 1 + config/coreboot/w541_12mb/target.cfg | 1 + config/coreboot/x220_8mb/target.cfg | 1 + config/coreboot/x230_12mb/target.cfg | 1 + config/coreboot/x230_16mb/target.cfg | 1 + config/coreboot/x230t_12mb/target.cfg | 1 + config/coreboot/x230t_16mb/target.cfg | 1 + config/git/bios_extract | 6 - config/git/bios_extract/pkg.cfg | 3 + config/git/biosutilities | 6 - config/git/biosutilities/pkg.cfg | 3 + config/git/coreboot | 6 - config/git/coreboot/pkg.cfg | 3 + config/git/docs | 6 - config/git/docs/pkg.cfg | 3 + config/git/flashprog | 6 - config/git/flashprog/pkg.cfg | 3 + config/git/grub | 6 - config/git/grub/pkg.cfg | 3 + config/git/memtest86plus | 6 - config/git/memtest86plus/pkg.cfg | 3 + config/git/pico-sdk | 6 - config/git/pico-sdk/pkg.cfg | 3 + config/git/pico-serprog | 7 - config/git/pico-serprog/pkg.cfg | 4 + config/git/seabios | 6 - config/git/seabios/pkg.cfg | 3 + config/git/stm32-vserprog | 6 - config/git/stm32-vserprog/pkg.cfg | 3 + config/git/u-boot | 6 - config/git/u-boot/pkg.cfg | 3 + config/git/uefitool | 6 - config/git/uefitool/pkg.cfg | 3 + config/vendor/e6400/pkg.cfg | 5 + config/vendor/haswell/pkg.cfg | 3 + config/vendor/hp2170p/pkg.cfg | 6 + config/vendor/hp2560p/pkg.cfg | 6 + config/vendor/hp2570p/pkg.cfg | 6 + config/vendor/hp8200sff/pkg.cfg | 3 + config/vendor/hp820g2/pkg.cfg | 9 ++ config/vendor/hp8460pintel/pkg.cfg | 6 + config/vendor/hp8470pintel/pkg.cfg | 6 + config/vendor/hp8560w/pkg.cfg | 6 + config/vendor/hp9470m/pkg.cfg | 6 + config/vendor/ivybridge/pkg.cfg | 3 + config/vendor/sandybridge/pkg.cfg | 3 + config/vendor/sources | 166 ------------------------ config/vendor/t1650/pkg.cfg | 6 + include/git.sh | 16 +-- include/lib.sh | 34 ++--- include/vendor.sh | 30 ++--- script/roms | 3 +- script/trees | 17 +-- 83 files changed, 190 insertions(+), 306 deletions(-) delete mode 100644 config/git/bios_extract create mode 100644 config/git/bios_extract/pkg.cfg delete mode 100644 config/git/biosutilities create mode 100644 config/git/biosutilities/pkg.cfg delete mode 100644 config/git/coreboot create mode 100644 config/git/coreboot/pkg.cfg delete mode 100644 config/git/docs create mode 100644 config/git/docs/pkg.cfg delete mode 100644 config/git/flashprog create mode 100644 config/git/flashprog/pkg.cfg delete mode 100644 config/git/grub create mode 100644 config/git/grub/pkg.cfg delete mode 100644 config/git/memtest86plus create mode 100644 config/git/memtest86plus/pkg.cfg delete mode 100644 config/git/pico-sdk create mode 100644 config/git/pico-sdk/pkg.cfg delete mode 100644 config/git/pico-serprog create mode 100644 config/git/pico-serprog/pkg.cfg delete mode 100644 config/git/seabios create mode 100644 config/git/seabios/pkg.cfg delete mode 100644 config/git/stm32-vserprog create mode 100644 config/git/stm32-vserprog/pkg.cfg delete mode 100644 config/git/u-boot create mode 100644 config/git/u-boot/pkg.cfg delete mode 100644 config/git/uefitool create mode 100644 config/git/uefitool/pkg.cfg create mode 100644 config/vendor/e6400/pkg.cfg create mode 100644 config/vendor/haswell/pkg.cfg create mode 100644 config/vendor/hp2170p/pkg.cfg create mode 100644 config/vendor/hp2560p/pkg.cfg create mode 100644 config/vendor/hp2570p/pkg.cfg create mode 100644 config/vendor/hp8200sff/pkg.cfg create mode 100644 config/vendor/hp820g2/pkg.cfg create mode 100644 config/vendor/hp8460pintel/pkg.cfg create mode 100644 config/vendor/hp8470pintel/pkg.cfg create mode 100644 config/vendor/hp8560w/pkg.cfg create mode 100644 config/vendor/hp9470m/pkg.cfg create mode 100644 config/vendor/ivybridge/pkg.cfg create mode 100644 config/vendor/sandybridge/pkg.cfg delete mode 100644 config/vendor/sources create mode 100644 config/vendor/t1650/pkg.cfg diff --git a/config/coreboot/dell9020mt_nri_12mb/target.cfg b/config/coreboot/dell9020mt_nri_12mb/target.cfg index b513e2b5..e32d25c1 100644 --- a/config/coreboot/dell9020mt_nri_12mb/target.cfg +++ b/config/coreboot/dell9020mt_nri_12mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" +vcfg="haswell" diff --git a/config/coreboot/dell9020sff_nri_12mb/target.cfg b/config/coreboot/dell9020sff_nri_12mb/target.cfg index b513e2b5..e32d25c1 100644 --- a/config/coreboot/dell9020sff_nri_12mb/target.cfg +++ b/config/coreboot/dell9020sff_nri_12mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" +vcfg="haswell" diff --git a/config/coreboot/e5420_6mb/target.cfg b/config/coreboot/e5420_6mb/target.cfg index 341e655e..f94ac308 100644 --- a/config/coreboot/e5420_6mb/target.cfg +++ b/config/coreboot/e5420_6mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="sandybridge" diff --git a/config/coreboot/e5520_6mb/target.cfg b/config/coreboot/e5520_6mb/target.cfg index 341e655e..f94ac308 100644 --- a/config/coreboot/e5520_6mb/target.cfg +++ b/config/coreboot/e5520_6mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="sandybridge" diff --git a/config/coreboot/e5530_12mb/target.cfg b/config/coreboot/e5530_12mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/e5530_12mb/target.cfg +++ b/config/coreboot/e5530_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/e6400_4mb/target.cfg b/config/coreboot/e6400_4mb/target.cfg index 8eeb3443..3aba9054 100644 --- a/config/coreboot/e6400_4mb/target.cfg +++ b/config/coreboot/e6400_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="e6400" diff --git a/config/coreboot/e6400nvidia_4mb/target.cfg b/config/coreboot/e6400nvidia_4mb/target.cfg index 8eeb3443..3aba9054 100644 --- a/config/coreboot/e6400nvidia_4mb/target.cfg +++ b/config/coreboot/e6400nvidia_4mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="e6400" diff --git a/config/coreboot/e6420_10mb/target.cfg b/config/coreboot/e6420_10mb/target.cfg index 341e655e..f94ac308 100644 --- a/config/coreboot/e6420_10mb/target.cfg +++ b/config/coreboot/e6420_10mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="sandybridge" diff --git a/config/coreboot/e6430_12mb/target.cfg b/config/coreboot/e6430_12mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/e6430_12mb/target.cfg +++ b/config/coreboot/e6430_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/e6520_10mb/target.cfg b/config/coreboot/e6520_10mb/target.cfg index 341e655e..f94ac308 100644 --- a/config/coreboot/e6520_10mb/target.cfg +++ b/config/coreboot/e6520_10mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="sandybridge" diff --git a/config/coreboot/e6530_12mb/target.cfg b/config/coreboot/e6530_12mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/e6530_12mb/target.cfg +++ b/config/coreboot/e6530_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg index 341e655e..47c00abd 100644 --- a/config/coreboot/hp2170p_16mb/target.cfg +++ b/config/coreboot/hp2170p_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="hp2170p" diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/coreboot/hp2560p_8mb/target.cfg index 341e655e..7152a2a4 100644 --- a/config/coreboot/hp2560p_8mb/target.cfg +++ b/config/coreboot/hp2560p_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="hp2560p" diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/coreboot/hp2570p_16mb/target.cfg index 341e655e..84e6f6e7 100644 --- a/config/coreboot/hp2570p_16mb/target.cfg +++ b/config/coreboot/hp2570p_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="hp2570p" diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg index a2b3d31f..6f1d4c4f 100644 --- a/config/coreboot/hp8200sff_4mb/target.cfg +++ b/config/coreboot/hp8200sff_4mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" +vcfg="hp8200sff" diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg index a2b3d31f..6f1d4c4f 100644 --- a/config/coreboot/hp8200sff_8mb/target.cfg +++ b/config/coreboot/hp8200sff_8mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" +vcfg="hp8200sff" 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" diff --git a/config/coreboot/hp8300cmt_16mb/target.cfg b/config/coreboot/hp8300cmt_16mb/target.cfg index a2b3d31f..dddffd7b 100644 --- a/config/coreboot/hp8300cmt_16mb/target.cfg +++ b/config/coreboot/hp8300cmt_16mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" +vcfg="ivybridge" diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/coreboot/hp8300usdt_16mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/hp8300usdt_16mb/target.cfg +++ b/config/coreboot/hp8300usdt_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/coreboot/hp8460pintel_8mb/target.cfg index 341e655e..32223f55 100644 --- a/config/coreboot/hp8460pintel_8mb/target.cfg +++ b/config/coreboot/hp8460pintel_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="hp8460pintel" diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/coreboot/hp8470pintel_16mb/target.cfg index 341e655e..6e6288b3 100644 --- a/config/coreboot/hp8470pintel_16mb/target.cfg +++ b/config/coreboot/hp8470pintel_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="hp8470pintel" diff --git a/config/coreboot/hp8560w_8mb/target.cfg b/config/coreboot/hp8560w_8mb/target.cfg index 341e655e..9dcf2f82 100644 --- a/config/coreboot/hp8560w_8mb/target.cfg +++ b/config/coreboot/hp8560w_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="hp8560w" diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/coreboot/hp9470m_16mb/target.cfg index 341e655e..a339e04c 100644 --- a/config/coreboot/hp9470m_16mb/target.cfg +++ b/config/coreboot/hp9470m_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="hp9470m" diff --git a/config/coreboot/t1650_12mb/target.cfg b/config/coreboot/t1650_12mb/target.cfg index a2b3d31f..b8212ffe 100644 --- a/config/coreboot/t1650_12mb/target.cfg +++ b/config/coreboot/t1650_12mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="nvme" +vcfg="t1650" diff --git a/config/coreboot/t420_8mb/target.cfg b/config/coreboot/t420_8mb/target.cfg index 341e655e..f94ac308 100644 --- a/config/coreboot/t420_8mb/target.cfg +++ b/config/coreboot/t420_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="sandybridge" diff --git a/config/coreboot/t420s_8mb/target.cfg b/config/coreboot/t420s_8mb/target.cfg index 341e655e..f94ac308 100644 --- a/config/coreboot/t420s_8mb/target.cfg +++ b/config/coreboot/t420s_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="sandybridge" diff --git a/config/coreboot/t430_12mb/target.cfg b/config/coreboot/t430_12mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/t430_12mb/target.cfg +++ b/config/coreboot/t430_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/t440plibremrc_12mb/target.cfg b/config/coreboot/t440plibremrc_12mb/target.cfg index b513e2b5..e32d25c1 100644 --- a/config/coreboot/t440plibremrc_12mb/target.cfg +++ b/config/coreboot/t440plibremrc_12mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" +vcfg="haswell" diff --git a/config/coreboot/t520_8mb/target.cfg b/config/coreboot/t520_8mb/target.cfg index 341e655e..f94ac308 100644 --- a/config/coreboot/t520_8mb/target.cfg +++ b/config/coreboot/t520_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="sandybridge" diff --git a/config/coreboot/t530_12mb/target.cfg b/config/coreboot/t530_12mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/t530_12mb/target.cfg +++ b/config/coreboot/t530_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/w530_12mb/target.cfg b/config/coreboot/w530_12mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/w530_12mb/target.cfg +++ b/config/coreboot/w530_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/w541_12mb/target.cfg b/config/coreboot/w541_12mb/target.cfg index b513e2b5..e32d25c1 100644 --- a/config/coreboot/w541_12mb/target.cfg +++ b/config/coreboot/w541_12mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" grubtree="xhci" +vcfg="haswell" diff --git a/config/coreboot/x220_8mb/target.cfg b/config/coreboot/x220_8mb/target.cfg index 341e655e..f94ac308 100644 --- a/config/coreboot/x220_8mb/target.cfg +++ b/config/coreboot/x220_8mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="sandybridge" diff --git a/config/coreboot/x230_12mb/target.cfg b/config/coreboot/x230_12mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/x230_12mb/target.cfg +++ b/config/coreboot/x230_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/x230_16mb/target.cfg b/config/coreboot/x230_16mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/x230_16mb/target.cfg +++ b/config/coreboot/x230_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/x230t_12mb/target.cfg b/config/coreboot/x230t_12mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/x230t_12mb/target.cfg +++ b/config/coreboot/x230t_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/coreboot/x230t_16mb/target.cfg b/config/coreboot/x230t_16mb/target.cfg index 341e655e..cbe91cbd 100644 --- a/config/coreboot/x230t_16mb/target.cfg +++ b/config/coreboot/x230t_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" +vcfg="ivybridge" diff --git a/config/git/bios_extract b/config/git/bios_extract deleted file mode 100644 index 2b313e83..00000000 --- a/config/git/bios_extract +++ /dev/null @@ -1,6 +0,0 @@ -{bios_extract}{ - rev: 0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0 - loc: bios_extract - url: https://review.coreboot.org/bios_extract - bkup_url: https://github.com/coreboot/bios_extract/ -} diff --git a/config/git/bios_extract/pkg.cfg b/config/git/bios_extract/pkg.cfg new file mode 100644 index 00000000..4b203544 --- /dev/null +++ b/config/git/bios_extract/pkg.cfg @@ -0,0 +1,3 @@ +rev="0a7bc1d71735ef97b00dfec0fd54a02fcc5d1bb0" +url="https://review.coreboot.org/bios_extract" +bkup_url="https://github.com/coreboot/bios_extract/" diff --git a/config/git/biosutilities b/config/git/biosutilities deleted file mode 100644 index bd11c88a..00000000 --- a/config/git/biosutilities +++ /dev/null @@ -1,6 +0,0 @@ -{biosutilities}{ - rev: 03ae0cf0706ede5a2a15da0986c19c776d0e6b26 - loc: biosutilities - url: https://codeberg.org/libreboot/BIOSUtilities - bkup_url: https://github.com/platomav/BIOSUtilities -} diff --git a/config/git/biosutilities/pkg.cfg b/config/git/biosutilities/pkg.cfg new file mode 100644 index 00000000..a1c02015 --- /dev/null +++ b/config/git/biosutilities/pkg.cfg @@ -0,0 +1,3 @@ +rev="03ae0cf0706ede5a2a15da0986c19c776d0e6b26" +url="https://codeberg.org/libreboot/BIOSUtilities" +bkup_url="https://github.com/platomav/BIOSUtilities" diff --git a/config/git/coreboot b/config/git/coreboot deleted file mode 100644 index 4b139e19..00000000 --- a/config/git/coreboot +++ /dev/null @@ -1,6 +0,0 @@ -{coreboot}{ - rev: HEAD - loc: coreboot/coreboot - url: https://review.coreboot.org/coreboot - bkup_url: https://github.com/coreboot/coreboot.git -} diff --git a/config/git/coreboot/pkg.cfg b/config/git/coreboot/pkg.cfg new file mode 100644 index 00000000..f4ed31e8 --- /dev/null +++ b/config/git/coreboot/pkg.cfg @@ -0,0 +1,3 @@ +rev="HEAD" +url="https://review.coreboot.org/coreboot" +bkup_url="https://github.com/coreboot/coreboot.git" diff --git a/config/git/docs b/config/git/docs deleted file mode 100644 index 22892a21..00000000 --- a/config/git/docs +++ /dev/null @@ -1,6 +0,0 @@ -{docs}{ - rev: e72d055915c3a9ffe739982946e101b146b2483c - loc: docs - url: https://codeberg.org/vimuser/untitled - bkup_url: https://notabug.org/untitled/untitled -} diff --git a/config/git/docs/pkg.cfg b/config/git/docs/pkg.cfg new file mode 100644 index 00000000..9913ee5f --- /dev/null +++ b/config/git/docs/pkg.cfg @@ -0,0 +1,3 @@ +rev="e72d055915c3a9ffe739982946e101b146b2483c" +url="https://codeberg.org/vimuser/untitled" +bkup_url="https://notabug.org/untitled/untitled" diff --git a/config/git/flashprog b/config/git/flashprog deleted file mode 100644 index 98a0539b..00000000 --- a/config/git/flashprog +++ /dev/null @@ -1,6 +0,0 @@ -{flashprog}{ - rev: 5b4fdd11dd74c7f018cb04f7a27a2badc02fe182 - loc: flashprog - url: https://review.sourcearcade.org/flashprog - bkup_url: https://github.com/SourceArcade/flashprog.git -} diff --git a/config/git/flashprog/pkg.cfg b/config/git/flashprog/pkg.cfg new file mode 100644 index 00000000..ddbd60a2 --- /dev/null +++ b/config/git/flashprog/pkg.cfg @@ -0,0 +1,3 @@ +rev="5b4fdd11dd74c7f018cb04f7a27a2badc02fe182" +url="https://review.sourcearcade.org/flashprog" +bkup_url="https://github.com/SourceArcade/flashprog.git" 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" diff --git a/config/git/memtest86plus b/config/git/memtest86plus deleted file mode 100644 index c1f56623..00000000 --- a/config/git/memtest86plus +++ /dev/null @@ -1,6 +0,0 @@ -{memtest86plus}{ - rev: 5dcd424ea7afb857c1171e747ef064d98d26afeb - loc: memtest86plus - url: https://codeberg.org/libreboot/memtest86plus - bkup_url: https://github.com/memtest86plus/memtest86plus.git -} diff --git a/config/git/memtest86plus/pkg.cfg b/config/git/memtest86plus/pkg.cfg new file mode 100644 index 00000000..4bf44294 --- /dev/null +++ b/config/git/memtest86plus/pkg.cfg @@ -0,0 +1,3 @@ +rev="5dcd424ea7afb857c1171e747ef064d98d26afeb" +url="https://codeberg.org/libreboot/memtest86plus" +bkup_url="https://github.com/memtest86plus/memtest86plus.git" diff --git a/config/git/pico-sdk b/config/git/pico-sdk deleted file mode 100644 index 076a8e01..00000000 --- a/config/git/pico-sdk +++ /dev/null @@ -1,6 +0,0 @@ -{pico-sdk}{ - rev: 6a7db34ff63345a7badec79ebea3aaef1712f374 - loc: pico-sdk - url: https://codeberg.org/libreboot/pico-sdk - bkup_url: https://github.com/raspberrypi/pico-sdk -} diff --git a/config/git/pico-sdk/pkg.cfg b/config/git/pico-sdk/pkg.cfg new file mode 100644 index 00000000..68b5bca6 --- /dev/null +++ b/config/git/pico-sdk/pkg.cfg @@ -0,0 +1,3 @@ +rev="6a7db34ff63345a7badec79ebea3aaef1712f374" +url="https://codeberg.org/libreboot/pico-sdk" +bkup_url="https://github.com/raspberrypi/pico-sdk" diff --git a/config/git/pico-serprog b/config/git/pico-serprog deleted file mode 100644 index 6d46566b..00000000 --- a/config/git/pico-serprog +++ /dev/null @@ -1,7 +0,0 @@ -{pico-serprog}{ - rev: e75e3a20e63269a5e3189bc2e49a6a81d45a636a - loc: pico-serprog - url: https://codeberg.org/libreboot/pico-serprog - bkup_url: https://git.disroot.org/libreboot/pico-serprog - depend: pico-sdk -} diff --git a/config/git/pico-serprog/pkg.cfg b/config/git/pico-serprog/pkg.cfg new file mode 100644 index 00000000..54c5fa44 --- /dev/null +++ b/config/git/pico-serprog/pkg.cfg @@ -0,0 +1,4 @@ +rev="e75e3a20e63269a5e3189bc2e49a6a81d45a636a" +url="https://codeberg.org/libreboot/pico-serprog" +bkup_url="https://git.disroot.org/libreboot/pico-serprog" +depend="pico-sdk" diff --git a/config/git/seabios b/config/git/seabios deleted file mode 100644 index 62c90d30..00000000 --- a/config/git/seabios +++ /dev/null @@ -1,6 +0,0 @@ -{seabios}{ - rev: HEAD - loc: seabios/seabios - url: https://review.coreboot.org/seabios - bkup_url: https://github.com/coreboot/seabios -} diff --git a/config/git/seabios/pkg.cfg b/config/git/seabios/pkg.cfg new file mode 100644 index 00000000..d8c6932b --- /dev/null +++ b/config/git/seabios/pkg.cfg @@ -0,0 +1,3 @@ +rev="HEAD" +url="https://review.coreboot.org/seabios" +bkup_url="https://github.com/coreboot/seabios" diff --git a/config/git/stm32-vserprog b/config/git/stm32-vserprog deleted file mode 100644 index 37e901fc..00000000 --- a/config/git/stm32-vserprog +++ /dev/null @@ -1,6 +0,0 @@ -{stm32-vserprog}{ - rev: 8fcf0a4d41800631b571fa7bbd1d8b251f0a2111 - loc: stm32-vserprog - url: https://codeberg.org/libreboot/stm32-vserprog - bkup_url: https://git.disroot.org/libreboot/stm32-vserprog -} diff --git a/config/git/stm32-vserprog/pkg.cfg b/config/git/stm32-vserprog/pkg.cfg new file mode 100644 index 00000000..9fb12c63 --- /dev/null +++ b/config/git/stm32-vserprog/pkg.cfg @@ -0,0 +1,3 @@ +rev="8fcf0a4d41800631b571fa7bbd1d8b251f0a2111" +url="https://codeberg.org/libreboot/stm32-vserprog" +bkup_url="https://git.disroot.org/libreboot/stm32-vserprog" diff --git a/config/git/u-boot b/config/git/u-boot deleted file mode 100644 index 4057c089..00000000 --- a/config/git/u-boot +++ /dev/null @@ -1,6 +0,0 @@ -{u-boot}{ - rev: HEAD - loc: u-boot/u-boot - url: https://source.denx.de/u-boot/u-boot.git - bkup_url: https://github.com/u-boot/u-boot.git -} diff --git a/config/git/u-boot/pkg.cfg b/config/git/u-boot/pkg.cfg new file mode 100644 index 00000000..e65ad63a --- /dev/null +++ b/config/git/u-boot/pkg.cfg @@ -0,0 +1,3 @@ +rev="HEAD" +url="https://source.denx.de/u-boot/u-boot.git" +bkup_url="https://github.com/u-boot/u-boot.git" diff --git a/config/git/uefitool b/config/git/uefitool deleted file mode 100644 index e3ced920..00000000 --- a/config/git/uefitool +++ /dev/null @@ -1,6 +0,0 @@ -{uefitool}{ - rev: 4a41c33596e9bc3ae812e763965d91ac57553e02 - loc: uefitool - url: https://codeberg.org/libreboot/UEFITool - bkup_url: https://github.com/LongSoft/UEFITool -} diff --git a/config/git/uefitool/pkg.cfg b/config/git/uefitool/pkg.cfg new file mode 100644 index 00000000..1602e6be --- /dev/null +++ b/config/git/uefitool/pkg.cfg @@ -0,0 +1,3 @@ +rev="4a41c33596e9bc3ae812e763965d91ac57553e02" +url="https://codeberg.org/libreboot/UEFITool" +bkup_url="https://github.com/LongSoft/UEFITool" diff --git a/config/vendor/e6400/pkg.cfg b/config/vendor/e6400/pkg.cfg new file mode 100644 index 00000000..5274f51b --- /dev/null +++ b/config/vendor/e6400/pkg.cfg @@ -0,0 +1,5 @@ +E6400_VGA_DL_hash="6217d5fce2291d15bb0649fd2faaeb78e4c48962b07a2bea6af60466bfdc5f233af0d077c2c6e71dd96047bdbb1f612324cef0a5e728ba9a9ec5c69a4022cd8d" +E6400_VGA_DL_url="https://dl.dell.com/FOLDER01530530M/1/E6400A34.exe" +E6400_VGA_DL_url_bkup="https://web.archive.org/web/20230506014903/https://dl.dell.com/FOLDER01530530M/1/E6400A34.exe" +E6400_VGA_offset="274451" +E6400_VGA_romname="mod_21.bin" diff --git a/config/vendor/haswell/pkg.cfg b/config/vendor/haswell/pkg.cfg new file mode 100644 index 00000000..d43fab3c --- /dev/null +++ b/config/vendor/haswell/pkg.cfg @@ -0,0 +1,3 @@ +DL_hash="f3d79aec805c8b0094a4081be76b3a22d329c479ad18210449b7acc3236ccfc4a2103eaa7c5b79a4872bfd699eede047efd46dfb06dc8f47e3216fc254612998" +DL_url="https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe" +DL_url_bkup="https://web.archive.org/web/20211120031520/https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe" diff --git a/config/vendor/hp2170p/pkg.cfg b/config/vendor/hp2170p/pkg.cfg new file mode 100644 index 00000000..71c4d637 --- /dev/null +++ b/config/vendor/hp2170p/pkg.cfg @@ -0,0 +1,6 @@ +DL_hash="4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c" +DL_url="https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +DL_url_bkup="https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +EC_hash="940e533b6a276c13a6e46a93795ca84b19877b05e82c0c1795b7fea9cbea63c28e606ef994352fc77c4fdfb2e0c31c5edeefa98b989e1990364dfc6417b25460" +EC_url="https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96088.exe" +EC_url_bkup="https://web.archive.org/web/20230909164345/https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96088.exe" diff --git a/config/vendor/hp2560p/pkg.cfg b/config/vendor/hp2560p/pkg.cfg new file mode 100644 index 00000000..21d00424 --- /dev/null +++ b/config/vendor/hp2560p/pkg.cfg @@ -0,0 +1,6 @@ +DL_hash="81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3" +DL_url="https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe" +DL_url_bkup="https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe" +EC_hash="a602cc7627c569bc423a5857cf506fbc3bcd68cb6b43a7c1b99d12a569b4107c412748cf49605ef4d5b930eb14b6815c4d1b1dc20145fe9d707e445fc201cea2" +EC_url="https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85526.exe" +EC_url_bkup="https://web.archive.org/web/20230416125725/https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85526.exe" diff --git a/config/vendor/hp2570p/pkg.cfg b/config/vendor/hp2570p/pkg.cfg new file mode 100644 index 00000000..de7f768e --- /dev/null +++ b/config/vendor/hp2570p/pkg.cfg @@ -0,0 +1,6 @@ +DL_hash="4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c" +DL_url="https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +DL_url_bkup="https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +EC_hash="61ed284bdf938c5f36ad3267263fb3963a6608339425bc41aaef3ab0cd98f07c998d816b0233735ca35dc6cb771257da3f09a40d5cfc96bb6388b4366348275e" +EC_url="https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96085.exe" +EC_url_bkup="https://web.archive.org/web/20230610174558/https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96085.exe" diff --git a/config/vendor/hp8200sff/pkg.cfg b/config/vendor/hp8200sff/pkg.cfg new file mode 100644 index 00000000..079bd0be --- /dev/null +++ b/config/vendor/hp8200sff/pkg.cfg @@ -0,0 +1,3 @@ +DL_hash="8fcb691bf84dc1feefc3c84f7cc59eadaabb200477bb3ecba1b050f23f133b0a8c2539015a523f676544c2dff64599bcba7e844e8c31757b90d70bb4485b5664" +DL_url="https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96026.exe" +DL_url_bkup="https://web.archive.org/web/20220708171920/https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96026.exe" diff --git a/config/vendor/hp820g2/pkg.cfg b/config/vendor/hp820g2/pkg.cfg new file mode 100644 index 00000000..3a95b5ea --- /dev/null +++ b/config/vendor/hp820g2/pkg.cfg @@ -0,0 +1,9 @@ +DL_hash="1ac05a3e4f46426eeb77f89c4aca25ed1ad64479d8fcba6a3ab63a944512bacbc5d148cc7b9c4ff4b8c90a1fb1de4776e46f14aca8021900e0df37246aa0b717" +DL_url="https://download.lenovo.com/pccbbs/mobiles/n10rg50w.exe" +DL_url_bkup="https://download.lenovo.com/pccbbs/mobiles/n10rg50w.exe" +MRC_url="https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_13904.77.0_samus_recovery_stable-channel_mp-v3.bin.zip" +MRC_url_bkup="https://web.archive.org/web/20220310155922/https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_13904.77.0_samus_recovery_stable-channel_mp-v3.bin.zip" +MRC_hash="3ff1599c52539f0707a07a8664a84ce51cd3fed1569df4bb7aa6722fc8dec0af1754250333b6ca1a9794d970a4de7b29a5cf2499f5b61e4c3eab64d1314aaea9" +MRC_board="samus" +MRC_refcode_cbtree="coreboot413" +MRC_refcode_gbe="131253" diff --git a/config/vendor/hp8460pintel/pkg.cfg b/config/vendor/hp8460pintel/pkg.cfg new file mode 100644 index 00000000..d818a00b --- /dev/null +++ b/config/vendor/hp8460pintel/pkg.cfg @@ -0,0 +1,6 @@ +DL_hash="81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3" +DL_url="https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe" +DL_url_bkup="https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe" +EC_hash="9be5511d7ba07a376583cbd0b7fa4d7dff87ebc94b78d489fd62a14cb7f61eac99670e6a10ce374fe8e3c4bdafabbd1edce7774c3a482c15c2d4207b74ea49ed" +EC_url="https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85528.exe" +EC_url_bkup="https://web.archive.org/web/20211231004901/https://ftp.ext.hp.com/pub/softpaq/sp85501-86000/sp85528.exe" diff --git a/config/vendor/hp8470pintel/pkg.cfg b/config/vendor/hp8470pintel/pkg.cfg new file mode 100644 index 00000000..3dce5557 --- /dev/null +++ b/config/vendor/hp8470pintel/pkg.cfg @@ -0,0 +1,6 @@ +DL_hash="4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c" +DL_url="https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +DL_url_bkup="https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +EC_hash="b95c9cf909ed537fb448e2be69eddcb57459efbaf0a979a73cd2bce90a7014b110f4dbbeecfd596c072636396b8f20c229c59ffe34e45500ce9edb000c6ccaf9" +EC_url="https://ftp.hp.com/pub/softpaq/sp77501-78000/sp77818.exe" +EC_url_bkup="https://web.archive.org/web/20230909173821/https://ftp.hp.com/pub/softpaq/sp77501-78000/sp77818.exe" diff --git a/config/vendor/hp8560w/pkg.cfg b/config/vendor/hp8560w/pkg.cfg new file mode 100644 index 00000000..b9dc94c5 --- /dev/null +++ b/config/vendor/hp8560w/pkg.cfg @@ -0,0 +1,6 @@ +DL_hash="81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3" +DL_url="https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe" +DL_url_bkup="https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe" +EC_hash="8e2bc5dca1a1cf0cfc1ac9df74eb6fda333f8ae560019f8182a49d3a716d72938f6cde4aa5ee56942def08207d3ef95706653bd238768fd029da43e9a4fbcc67" +EC_url="https://ftp.hp.com/pub/softpaq/sp78001-78500/sp78085.exe" +EC_url_bkup="https://web.archive.org/web/20230402085323/https://ftp.hp.com/pub/softpaq/sp78001-78500/sp78085.exe" diff --git a/config/vendor/hp9470m/pkg.cfg b/config/vendor/hp9470m/pkg.cfg new file mode 100644 index 00000000..756e64bf --- /dev/null +++ b/config/vendor/hp9470m/pkg.cfg @@ -0,0 +1,6 @@ +DL_hash="4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c" +DL_url="https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +DL_url_bkup="https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +EC_hash="563422bf5420da18b89439f28a38ea28a175f0ad3588f0f5ea39b08dfdd14c8d513cbf11c2125ec3869fc3b7222c7dc3d111415185ea9b73f41410b1b57f13bd" +EC_url="https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96090.exe" +EC_url_bkup="http://web.archive.org/web/20220504072602/https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96090.exe" diff --git a/config/vendor/ivybridge/pkg.cfg b/config/vendor/ivybridge/pkg.cfg new file mode 100644 index 00000000..92b1eb43 --- /dev/null +++ b/config/vendor/ivybridge/pkg.cfg @@ -0,0 +1,3 @@ +DL_hash="4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c" +DL_url="https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +DL_url_bkup="https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" diff --git a/config/vendor/sandybridge/pkg.cfg b/config/vendor/sandybridge/pkg.cfg new file mode 100644 index 00000000..34add8d3 --- /dev/null +++ b/config/vendor/sandybridge/pkg.cfg @@ -0,0 +1,3 @@ +DL_hash="81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3" +DL_url="https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe" +DL_url_bkup="https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe" diff --git a/config/vendor/sources b/config/vendor/sources deleted file mode 100644 index 2096af54..00000000 --- a/config/vendor/sources +++ /dev/null @@ -1,166 +0,0 @@ -# This file holds the download sources for various intel blobs -# board shortnames are listed and enclosed by '{}' followed by an opening -# and closing '{}' for all blobs available for the board. -# The board shortname must be the name of the board minus the trailing rom size. -# If you want to make additions, try to add a backup url for download links and -# list hashes as sha1 sums. - -# NOTE: this file now defines checksums as sha512 (of the sha-2 family), -# where previously we used 160-bit SHA-1 algorithm; SHA-1 is not secure, -# having demonstrated collisions, so we have switched to using sha512sum - -{x230 x230t x230i t430 t530 w530}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe -} - -{x220 x220t t420 t520 t420s}{ - DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 - DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe -} - -# NOTE: google's manifest for archives containing mrc.bin, used here: -# https://web.archive.org/web/20210211071412/https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf -{t440plibremrc w541 dell9020sff_nri dell9020mt_nri}{ - DL_hash f3d79aec805c8b0094a4081be76b3a22d329c479ad18210449b7acc3236ccfc4a2103eaa7c5b79a4872bfd699eede047efd46dfb06dc8f47e3216fc254612998 - DL_url https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe - DL_url_bkup https://web.archive.org/web/20211120031520/https://download.lenovo.com/pccbbs/mobiles/glrg22ww.exe -} - -# broadwell mrc, and use me10 plus broadwell refcode -{hp820g2}{ - DL_hash 1ac05a3e4f46426eeb77f89c4aca25ed1ad64479d8fcba6a3ab63a944512bacbc5d148cc7b9c4ff4b8c90a1fb1de4776e46f14aca8021900e0df37246aa0b717 - DL_url https://download.lenovo.com/pccbbs/mobiles/n10rg50w.exe - DL_url_bkup https://download.lenovo.com/pccbbs/mobiles/n10rg50w.exe - MRC_url https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_13904.77.0_samus_recovery_stable-channel_mp-v3.bin.zip - MRC_url_bkup https://web.archive.org/web/20220310155922/https://dl.google.com/dl/edgedl/chromeos/recovery/chromeos_13904.77.0_samus_recovery_stable-channel_mp-v3.bin.zip - MRC_hash 3ff1599c52539f0707a07a8664a84ce51cd3fed1569df4bb7aa6722fc8dec0af1754250333b6ca1a9794d970a4de7b29a5cf2499f5b61e4c3eab64d1314aaea9 - MRC_board samus - MRC_refcode_cbtree coreboot413 - MRC_refcode_gbe 131253 -} - -{hp8200sff}{ - DL_hash 8fcb691bf84dc1feefc3c84f7cc59eadaabb200477bb3ecba1b050f23f133b0a8c2539015a523f676544c2dff64599bcba7e844e8c31757b90d70bb4485b5664 - DL_url https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96026.exe - DL_url_bkup https://web.archive.org/web/20220708171920/https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96026.exe -} - -{hp8300usdt hp8300cmt}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe -} - -{hp2560p}{ - DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 - DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - - EC_hash a602cc7627c569bc423a5857cf506fbc3bcd68cb6b43a7c1b99d12a569b4107c412748cf49605ef4d5b930eb14b6815c4d1b1dc20145fe9d707e445fc201cea2 - EC_url https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85526.exe - EC_url_bkup https://web.archive.org/web/20230416125725/https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85526.exe -} - -{hp2570p}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - EC_hash 61ed284bdf938c5f36ad3267263fb3963a6608339425bc41aaef3ab0cd98f07c998d816b0233735ca35dc6cb771257da3f09a40d5cfc96bb6388b4366348275e - EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96085.exe - EC_url_bkup https://web.archive.org/web/20230610174558/https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96085.exe -} - -{hp9470m}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - EC_hash 563422bf5420da18b89439f28a38ea28a175f0ad3588f0f5ea39b08dfdd14c8d513cbf11c2125ec3869fc3b7222c7dc3d111415185ea9b73f41410b1b57f13bd - EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96090.exe - EC_url_bkup http://web.archive.org/web/20220504072602/https://ftp.ext.hp.com/pub/softpaq/sp96001-96500/sp96090.exe -} - -{hp2170p}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - EC_hash 940e533b6a276c13a6e46a93795ca84b19877b05e82c0c1795b7fea9cbea63c28e606ef994352fc77c4fdfb2e0c31c5edeefa98b989e1990364dfc6417b25460 - EC_url https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96088.exe - EC_url_bkup https://web.archive.org/web/20230909164345/https://ftp.hp.com/pub/softpaq/sp96001-96500/sp96088.exe -} - -{t1650}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - SCH5545EC_DL_url https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe - SCH5545EC_DL_url_bkup https://web.archive.org/web/20230811151654/https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe - SCH5545EC_DL_hash 18261d0f7f27e9de3b0b5a25019b9a934ef1a61cd3f0140e34f38553695e91e671e227a8fa962774edceab5c7804d13ed9fe1c518c5643c7c8f15632f903a6c4 -} - -# 68SCF and 68SCE family ROM -# for 8460p, 8460w, 6460b, 8560p, 6560b, 6360b -# release notes: https://support.hp.com/soar-attachment/858/col37737-ob-206569-2-ob-206569-2_sp85528_releasedoc.html -{hp8460pintel}{ - DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 - DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - - EC_hash 9be5511d7ba07a376583cbd0b7fa4d7dff87ebc94b78d489fd62a14cb7f61eac99670e6a10ce374fe8e3c4bdafabbd1edce7774c3a482c15c2d4207b74ea49ed - EC_url https://ftp.hp.com/pub/softpaq/sp85501-86000/sp85528.exe - EC_url_bkup https://web.archive.org/web/20211231004901/https://ftp.ext.hp.com/pub/softpaq/sp85501-86000/sp85528.exe -} - -# 68SVD family ROM -# for 8560w -# release notes: https://support.hp.com/soar-attachment/519/col44309-ob-185196-2-ob-185196-2_sp78085_releasedoc.html -{hp8560w}{ - DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 - DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - - EC_hash 8e2bc5dca1a1cf0cfc1ac9df74eb6fda333f8ae560019f8182a49d3a716d72938f6cde4aa5ee56942def08207d3ef95706653bd238768fd029da43e9a4fbcc67 - EC_url https://ftp.hp.com/pub/softpaq/sp78001-78500/sp78085.exe - EC_url_bkup https://web.archive.org/web/20230402085323/https://ftp.hp.com/pub/softpaq/sp78001-78500/sp78085.exe -} - -# 68ICE or 68ICF family ROM -# for 8470p, 8470w, 6470b, 8570p, 6570b -# release notes: https://support.hp.com/soar-attachment/1021/col43350-ob-229442-2-ob-229442-2_sp96091_releasedoc.html -{hp8470pintel}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - - EC_hash b95c9cf909ed537fb448e2be69eddcb57459efbaf0a979a73cd2bce90a7014b110f4dbbeecfd596c072636396b8f20c229c59ffe34e45500ce9edb000c6ccaf9 - EC_url https://ftp.hp.com/pub/softpaq/sp77501-78000/sp77818.exe - EC_url_bkup https://web.archive.org/web/20230909173821/https://ftp.hp.com/pub/softpaq/sp77501-78000/sp77818.exe -} - -# nvidia vga option rom for dgpu models of Dell Latitude E6400 -# for downloading the nvidia rom to pciroms/pci10de,06eb.rom -{e6400 e6400nvidia}{ - E6400_VGA_DL_hash 6217d5fce2291d15bb0649fd2faaeb78e4c48962b07a2bea6af60466bfdc5f233af0d077c2c6e71dd96047bdbb1f612324cef0a5e728ba9a9ec5c69a4022cd8d - E6400_VGA_DL_url https://dl.dell.com/FOLDER01530530M/1/E6400A34.exe - E6400_VGA_DL_url_bkup https://web.archive.org/web/20230506014903/https://dl.dell.com/FOLDER01530530M/1/E6400A34.exe - E6400_VGA_offset 274451 - E6400_VGA_romname mod_21.bin -} - -{e5420 e5520 e6420 e6520}{ - DL_hash 81c9917938c4a2a4f128c976250451931efd0f25b51ff34f058ddacb8eec27272691371864a683ec7abcb924fea32592d061584c7b2571a5d3e84eb870281cc3 - DL_url https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe - DL_url_bkup https://web.archive.org/web/20220202201637/https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles/83rf46ww.exe -} - -{e6430 e6530 e5530}{ - DL_hash 4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c - DL_url https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe - DL_url_bkup https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe -} diff --git a/config/vendor/t1650/pkg.cfg b/config/vendor/t1650/pkg.cfg new file mode 100644 index 00000000..e4a49126 --- /dev/null +++ b/config/vendor/t1650/pkg.cfg @@ -0,0 +1,6 @@ +DL_hash="4dc908050c91c1227645c900ddee88652937540af4ba222b0239b7f459f260cdf6e5e8113ac14e5543d00cf53abdd6c7bd23e61f690de1ce45a3709a30cbb91c" +DL_url="https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +DL_url_bkup="https://web.archive.org/web/20210706183911/https://download.lenovo.com/pccbbs/mobiles/g1rg24ww.exe" +SCH5545EC_DL_url="https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe" +SCH5545EC_DL_url_bkup="https://web.archive.org/web/20230811151654/https://dl.dell.com/FOLDER05065992M/1/T1650A28.exe" +SCH5545EC_DL_hash="18261d0f7f27e9de3b0b5a25019b9a934ef1a61cd3f0140e34f38553695e91e671e227a8fa962774edceab5c7804d13ed9fe1c518c5643c7c8f15632f903a6c4" diff --git a/include/git.sh b/include/git.sh index e2fd2129..a10fb014 100755 --- a/include/git.sh +++ b/include/git.sh @@ -31,10 +31,8 @@ fetch_config() load_target_config() { - [ -f "$cfgsdir/$1/target.cfg" ] || $err "$1: target.cfg missing" [ -f "$cfgsdir/$1/seen" ] && $err "$_xm cfg: infinite loop in trees" - - . "$cfgsdir/$1/target.cfg" || $err "load_target_config !$cfgsdir/$1" + eval `setcfg "$cfgsdir/$1/target.cfg"` touch "$cfgsdir/$1/seen" || $err "load_config $cfgsdir/$1: !mk seen" } @@ -50,9 +48,9 @@ prepare_new_tree() fetch_project_repo() { eval "$(setvars "" xtree tree_depend)" + eval `setcfg "config/git/$project/pkg.cfg"` - scan_config "$project" "config/git" - chkvars loc url + chkvars url [ -n "$xtree" ] && [ ! -d "src/coreboot/$xtree" ] && \ x_ ./update trees -f coreboot "$xtree" @@ -63,14 +61,14 @@ fetch_project_repo() clone_project for x in config/git/*; do - [ -f "$x" ] && nuke "${x##*/}" "src/${x##*/}" 2>/dev/null - done + [ -d "$x" ] && nuke "${x##*/}" "src/${x##*/}" 2>/dev/null + done; return 0 } clone_project() { - loc="${loc#src/}" - loc="src/$loc" + loc="src/$project" + singletree "$project" || loc="src/$project/$project" printf "Downloading project '%s' to '%s'\n" "$project" "$loc" e "$loc" d && return 0 diff --git a/include/lib.sh b/include/lib.sh index 2fc17cfe..3e137d63 100755 --- a/include/lib.sh +++ b/include/lib.sh @@ -60,9 +60,7 @@ read -r projectsite < projectsite || : install_packages() { [ $# -lt 2 ] && badcmd "fewer than two arguments" - [ -f "config/dependencies/$2" ] || badcmd "unsupported target" - - . "config/dependencies/$2" || $err "! . config/dependencies/$2" + eval `setcfg "config/dependencies/$2"` $pkg_add $pkglist || $err "Cannot install packages" @@ -127,25 +125,6 @@ done relname="$projectname-$version" export LOCALVERSION="-$projectname-${version%%-*}" -scan_config() -{ - awkstr=" /\{.*$1.*}{/ {flag=1;next} /\}/{flag=0} flag { print }" - confdir="$2" - revfile="$(mktemp -t sources.XXXXXXXXXX)" - cat "$confdir/"* > "$revfile" || $err "$confdir: can't cat files" - while read -r line ; do - set $line 1>/dev/null 2>/dev/null || : - if [ "${1%:}" = "depend" ]; then - depend="$depend $2" - else - eval "${1%:}=\"$2\"" - fi - done << EOF - $(eval "awk '$awkstr' \"$revfile\"") -EOF - rm -f "$revfile" || $err "scan_config: Cannot remove tmpfile" -} - check_defconfig() { [ -d "$1" ] || $err "Target '$1' not defined." @@ -253,3 +232,14 @@ cbfs() lzma="-c lzma" && [ $# -gt 3 ] && lzma="-t raw" x_ "$cbfstool" "$1" $ccmd -f "$2" -n "$3" $lzma } + +setcfg() +{ + if [ $# -gt 1 ]; then + printf "e \"%s\" f missing && return %s;\n" "$1" "$2" + else + printf "e \"%s\" f missing && %s \"Missing config\";\n" "$1" \ + "$err" + fi + printf ". \"%s\" || %s \"Could not read config\";\n" "$1" "$err" +} diff --git a/include/vendor.sh b/include/vendor.sh index d7ecd55d..c8512337 100755 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -14,7 +14,7 @@ vendir="vendorfiles" appdir="$vendir/app" cbcfgsdir="config/coreboot" -eval "$(setvars "" _b EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe \ +eval "$(setvars "" EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe \ E6400_VGA_DL_hash E6400_VGA_DL_url E6400_VGA_DL_url_bkup E6400_VGA_offset \ E6400_VGA_romname CONFIG_HAVE_MRC SCH5545EC_DL_url_bkup SCH5545EC_DL_hash \ mecleaner kbc1126_ec_dump MRC_refcode_cbtree new_mac _dl SCH5545EC_DL_url \ @@ -24,29 +24,27 @@ eval "$(setvars "" _b EC_url_bkup EC_hash DL_hash DL_url_bkup MRC_refcode_gbe \ CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_KBC1126_FW1 release DL_url \ CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE nukemode \ CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE CONFIG_HAVE_REFCODE_BLOB cbfstoolref \ - CONFIG_REFCODE_BLOB_FILE)" + CONFIG_REFCODE_BLOB_FILE vcfg)" vendor_download() { export PATH="$PATH:/sbin" [ $# -gt 0 ] || $err "No argument given" - board="$1" - _b="${board%%_*mb}" # shorthand (no duplication per rom size) - boarddir="$cbcfgsdir/$board" && getcfg && scan_config "$_b" \ - "config/vendor" && bootstrap && getfiles; return 0 + board="$1"; boarddir="$cbcfgsdir/$board" + getcfg && bootstrap && getfiles; return 0 } getcfg() { - [ -d "$boarddir" ] || $err "Target '$board' not defined." + eval `setcfg "$boarddir/target.cfg"` + + [ -z "$vcfg" ] && printf "%s: vcfg unset\n" "$board" 1>&2 && return 1 + check_defconfig "$boarddir" 1>"$tmpdir/vendorcfg.list" && return 1 while read -r cbcfgfile; do - set +u +e - . "$cbcfgfile" 2>/dev/null - set -u -e + set +u +e; . "$cbcfgfile" 2>/dev/null; set -u -e done < "$tmpdir/vendorcfg.list" - . "$boarddir/target.cfg" 2>/dev/null [ -z "$tree" ] && $err "getcfg $boarddir: tree undefined" cbdir="src/coreboot/$tree" @@ -58,9 +56,10 @@ getcfg() for c in CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN CONFIG_KBC1126_FIRMWARE \ CONFIG_VGA_BIOS_FILE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW; do eval "[ \"\${$c}\" = \"/dev/null\" ] && continue" - eval "[ -z \"\${$c}\" ] || return 0" + eval "[ -z \"\${$c}\" ] && continue" + eval `setcfg "config/vendor/$vcfg/pkg.cfg"`; return 0 done - printf "Vendor files not needed for: %s\n" "$board" 1>&2 && return 1 + printf "Vendor files not needed for: %s\n" "$board" 1>&2; return 1 } bootstrap() @@ -274,10 +273,7 @@ check_board() fi boarddir="$cbcfgsdir/$board" - [ -d "$boarddir" ] || $err "check_board: board $board missing" - [ -f "$boarddir/target.cfg" ] || \ - $err "check_board $board: target.cfg missing" - . "$boarddir/target.cfg" 2>/dev/null + eval `setcfg "$boarddir/target.cfg"` [ -z "$tree" ] && $err "check_board $board: tree undefined"; return 0 } diff --git a/script/roms b/script/roms index 457a1baa..5cd8b66b 100755 --- a/script/roms +++ b/script/roms @@ -91,10 +91,9 @@ configure_target() board="$1" targetdir="$cfgsdir/$board" - [ -f "$targetdir/target.cfg" ] || $err "$board: target.cfg missing" # Override the above defaults using target.cfg - . "$targetdir/target.cfg" + eval `setcfg "$targetdir/target.cfg"` [ -z "$grub_scan_disk" ] && grub_scan_disk="nvme ahci ata" diff --git a/script/trees b/script/trees index b2b1e561..6a3c1ebd 100755 --- a/script/trees +++ b/script/trees @@ -35,7 +35,7 @@ main() [ -z "$_f" ] && $err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)" [ -z "$project" ] && $err "project name not specified" - [ -f "config/git/$project" ] || $err "project '$project' not defined" + [ -f "config/git/$project/pkg.cfg" ] || $err "'$project' not defined" elfdir="elf/$project" datadir="config/data/$project" @@ -154,9 +154,7 @@ load_project_config() { eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs xtree \ tree_depend makeargs)" - - [ -f "$1/target.cfg" ] || return 0 - . "$1/target.cfg" || $err "loadp $1: can't load target.cfg"; return 0 + eval `setcfg "$1/target.cfg" 0`; return 0 } check_cross_compiler() @@ -274,15 +272,12 @@ check_makefile() mkpayload_grub() { - [ -f "$grubdata/module/$tree" ] || $err "$tree: grub modules missing" - x_ rm -f "$cdir/grub.elf" - eval "$(setvars "" grub_modules grub_install_modules)" - - . "$grubdata/module/$tree" || $err "$tree: !source grub modules" - + eval `setcfg "$grubdata/module/$tree"` chkvars "grub_install_modules" "grub_modules" + x_ rm -f "$cdir/grub.elf" + "${cdir}/grub-mkstandalone" --grub-mkimage="${cdir}/grub-mkimage" \ -O i386-coreboot -o "${cdir}/grub.elf" -d "${cdir}/grub-core/" \ --fonts= --themes= --locales= --modules="$grub_modules" \ @@ -290,7 +285,7 @@ mkpayload_grub() "/boot/grub/grub_default.cfg=${cdir}/.config" \ "/boot/grub/grub.cfg=$grubdata/memdisk.cfg" \ "/background.png=$grubdata/background/background1280x800.png" || \ - $err "$tree: cannot build grub.elf" + $err "$tree: cannot build grub.elf"; return 0 } copy_elf() -- cgit v1.2.1