summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-06-22use backticks on eval commands, not subshellsLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-22lib.sh: remove badcmd()Leah Rowe
it's bloat. telling the user to rtfm is something that we already do on irc; they will still ask how to do everything, and ignore the message from badcmd(), or they will automatically know to rtfm. i'm on a massive purge, removing bloat from lbmk as part of Libreboot Build System Audit 6. all bloat must go. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-22lib.sh: more unified config handlingLeah Rowe
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>
2024-06-21trees: more robust check to avoid "make fetch"Leah Rowe
do not use shorthand here. the test was failing to produce the desired result under some circumstances, for example when i did "./update release" i got this: make: Entering directory '/home/lbdev/lbmk/release/20240612-62-ga6b1a6bd/libreboot-20240612-62-ga6b1a6bd_src/src/stm32-vserprog' make: *** No rule to make target 'fetch'. Stop. make: Leaving directory '/home/lbdev/lbmk/release/20240612-62-ga6b1a6bd/libreboot-20240612-62-ga6b1a6bd_src/src/stm32-vserprog' ERROR script/trees: !mk src/stm32-vserprog fetch ERROR ./update: excmd: script/trees -f ERROR script/roms: Unhandled non-zero exit: ./update ERROR ./build: excmd: script/roms serprog ERROR ./update: build_release release/20240612-62-ga6b1a6bd: stm32 ERROR ./update: can't build rom images in the above circumstance, run_make_command was executed, which is not the desired behaviour; rather, fetch_project_trees or fetch_project_repo should be called, and then the script should immediately exit. it should also exit, without downloading anything, if a changelog file exists as in release archives. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20roms: fix lack of backslash on multi-line commandLeah Rowe
Signed-off-by: Leah Rowe <info@minifree.org>
2024-06-20vendor.sh: more cleanupLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20Revert "roms: remove build_payloads() and split it up"Leah Rowe
This reverts commit 3610667e3db08ff1db4f7784ff5a879d8aebce9d. The output of some functions in the roms script are used as an argument in cp and mv commands, also cbfstool. I overlooked this fact in a previous code optimisation. Revert it. The change only reduced sloccount by a few lines anyway.
2024-06-20vendor.sh: correction (s/scancfg/scan_config)Leah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20git.sh: revert modification to for loopLeah Rowe
i tried to be clever with this one, but it just made the script exit with an error. revert back to the old check (check whether one of either repo or repo backup is set) Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20vendor.sh: minor code cleanupLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20minor code cleanup in the build systemLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20git.sh: general code cleanup in fetch_submodule()Leah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20git.sh: reduced indentation on repo/file checkLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20git.sh: simplified repo/backup checkLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-20roms: merge mkserprog() into main()Leah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-19roms: don't insert timeout.cfgLeah Rowe
this is bloat, because it's something the user can already do at runtime configuration anyway. set it to a reasonable default of 8 seconds instead of 5, and don't honour the timeout variable in target.cfg. this will be documented in the next release. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-19correctionLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-19roms: reduce indentation in build_grub_roms()Leah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-19roms: re-introduce accidentally disabled checkLeah Rowe
i disabled a check in the script, while testing a prior modification. re-introoduce the check, which is put there to yield an error condition if no targets were compiled. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-19roms: remove build_payloads() and split it upLeah Rowe
payloads are compiled before coreboot, but it doesn't matter to the build speed whether this is done first. reduce the lines of code by checking payload builds *while* adding them to the coreboot images. this means that coreboot is now compiled first, before the payloads. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-19roms: group some commands that are similarLeah Rowe
this makes the build_payloads() function nicer to read Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-19roms: remove mt86bin variableLeah Rowe
it's only meaningfully used once, so just hardcode the string, which is not set dynamically anyway. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: merge build_uboot_payload to build_payloadsLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: simplify payload_uboot y/n checkLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: simplify the check for serprog srcdirLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: simplify the loop for building serprog romsLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: shorten variable serprog_boards_dirLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: simplified serprog image copyLeah Rowe
use eval to avoid having two mv commands Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: rename picosrc variable to rp2040srcLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: remove useless confirmation in mkserprogfwLeah Rowe
the user knows where to look. replace it with a single declaration. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-18roms: merge serprog build into one functionLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-17roms: remind the user about gkb filesLeah Rowe
nowadays, we don't insert GRUB keymaps automatically, for sake of efficiency; without one, the default is US QWERTY. a user will only want one keymap in particular, so this is more efficient. in practise, they're either building from source anyway, or using the inject scripts which compile cbfstool anyway, so the user will already have cbfstool. also output this message from the inject script. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-17roms: rename x variable to it in for loopaudit6-merge1Leah Rowe
there are two for loops that use x as a variable anme, and an idiosyncrasy of certain sh implementations is that these become global; the result in this case was that when you finish building every target in "./build roms", it would print "libgfxinit" repeatedly, comma separated, instead of a comma-separated list of the targets that were built. work around it by renaming the variable in one of the loops. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: don't use x_ to call cproms()Leah Rowe
cproms() never returns non-zero, so it doesn't make sense to use x_ here Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms build_uboot_roms(): move rom, don't copyLeah Rowe
that way, we don't have to delete the temporary file. just move it entirely. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms cproms(): allow other commands besides cpLeah Rowe
e.g. the operator might specify mv instead Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16unify coreboot elfdir (DO_NOT_FLASH)Leah Rowe
use a common string when setting this path Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: merge mkUbootRom() into build_uboot_roms()Leah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: simplify mkSeabiosRom()Leah Rowe
remove variables that are not meaningfully used Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: simplify mkUbootRom()Leah Rowe
remove variables that are not meaningfully used Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: simplify build_roms()Leah Rowe
cbcfg is already a global variable, so there's no reason to set it again at the start of this function. remove the check for whether the given coreboot config exists, to the calling function instead of build_roms(). Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: remove unnecessary checkLeah Rowe
uboot_config is later only used if payload_uboot is set Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16build: remove unused variablesLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: further clean up build_grub_roms()Leah Rowe
the tmpcfg variable will be useful elsewhere, for the same kind of change as before. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: simplify timeout/scandisk insertionLeah Rowe
we don't need to call mktemp everytime. just use a staticly named file in tmpdir and keep overwriting it. these files are only small, and they get deleted when the build system exits later on. Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: simplify seagrub check in build_grub_romsLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: simplify mkserprog()Leah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16roms: simplify the serprog build functionsLeah Rowe
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-16script/roms: fix serprog build commandsLeah Rowe
forgot to shift Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-15roms: simplified ubootelf checkLeah Rowe
we check it twice, which we don't need to do. we only need to check it once! Signed-off-by: Leah Rowe <leah@libreboot.org>