From 0faef899469818410e5e6d481f1e6c4fa5ad3d3d Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 7 May 2025 13:27:25 +0100 Subject: lib.sh: support any command on find_exec() right now, we assume "find", but it adds any number of arguments next to that. change it instead to support any command, where the assumption is that it would generate a list of files and directories. Signed-off-by: Leah Rowe --- include/rom.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/rom.sh') diff --git a/include/rom.sh b/include/rom.sh index 0eebdabb..09270829 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -192,7 +192,7 @@ mkseagrub() [ "$payload_grubsea" = "y" ] && pname="grub" [ "$payload_grubsea" = "y" ] || \ cbfs "$tmprom" "$grubdata/bootorder" bootorder raw - fe_ "cprom" "$grubdata/keymap" -type f -name "*.gkb" + fe_ cprom find "$grubdata/keymap" -type f -name "*.gkb" } add_uboot() -- cgit v1.2.1 From d2e6f989d7ef1250bedac1ad5c93e8f6220a5fd0 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 7 May 2025 13:44:05 +0100 Subject: rom.sh: build serprog images with fe_ Signed-off-by: Leah Rowe --- include/rom.sh | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'include/rom.sh') diff --git a/include/rom.sh b/include/rom.sh index 09270829..182282b1 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -9,22 +9,19 @@ grubdata="config/data/grub" mkserprog() { - [ "$_f" = "-d" ] && return 0 # dry run - basename -as .h "$serdir/"*.h > "$xbmktmp/ser" || \ - err "!mk $1 $xbmktmp" - - while read -r sertarget; do - [ "$1" = "pico" ] && x_ cmake -DPICO_BOARD="$sertarget" \ - -DPICO_SDK_PATH="$picosdk" -B "$sersrc/build" "$sersrc" \ - && x_ cmake --build "$sersrc/build" - [ "$1" = "stm32" ] && x_ make -C "$sersrc" \ - libopencm3-just-make BOARD=$sertarget && x_ make -C \ - "$sersrc" BOARD=$sertarget - x_ mkdir -p "bin/serprog_$1" - x_ mv "$serx" "bin/serprog_$1/serprog_$sertarget.${serx##*.}" - done < "$xbmktmp/ser" - - [ "$XBMK_RELEASE" = "y" ] && mkrom_tarball "bin/serprog_$1"; : + $dry fe_ "eval buildser \"$1\"" basename -as .h "$serdir/"*.h + [ "$XBMK_RELEASE" = "y" ] && $dry mkrom_tarball "bin/serprog_$1"; : +} + +buildser() +{ + [ "$1" = "pico" ] && x_ cmake -DPICO_BOARD="$2" \ + -DPICO_SDK_PATH="$picosdk" -B "$sersrc/build" "$sersrc" && \ + x_ cmake --build "$sersrc/build" + [ "$1" = "stm32" ] && x_ make -C "$sersrc" libopencm3-just-make \ + BOARD=$2 && x_ make -C "$sersrc" BOARD=$2 + x_ mkdir -p "bin/serprog_$1" + x_ mv "$serx" "bin/serprog_$1/serprog_$2.${serx##*.}" } copyps1bios() -- cgit v1.2.1 From 0ef77e65832e1ebf75a4fbfde977a55b7251d5c0 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 7 May 2025 14:01:50 +0100 Subject: build serprog using fe_ *defined inside mkhelper* sh macros ftw Signed-off-by: Leah Rowe --- include/rom.sh | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include/rom.sh') diff --git a/include/rom.sh b/include/rom.sh index 182282b1..cb3c1298 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -7,12 +7,6 @@ grubdata="config/data/grub" -mkserprog() -{ - $dry fe_ "eval buildser \"$1\"" basename -as .h "$serdir/"*.h - [ "$XBMK_RELEASE" = "y" ] && $dry mkrom_tarball "bin/serprog_$1"; : -} - buildser() { [ "$1" = "pico" ] && x_ cmake -DPICO_BOARD="$2" \ -- cgit v1.2.1 From ec5c954337b2e1ea50b0ace0f1086e48f20e7774 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 7 May 2025 15:12:10 +0100 Subject: lib.sh: Simplified fx_() and removed fe_() Instead of calling fe_, prefix x_ as indicated. Signed-off-by: Leah Rowe --- include/rom.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/rom.sh') diff --git a/include/rom.sh b/include/rom.sh index cb3c1298..fdd0787f 100644 --- a/include/rom.sh +++ b/include/rom.sh @@ -183,7 +183,7 @@ mkseagrub() [ "$payload_grubsea" = "y" ] && pname="grub" [ "$payload_grubsea" = "y" ] || \ cbfs "$tmprom" "$grubdata/bootorder" bootorder raw - fe_ cprom find "$grubdata/keymap" -type f -name "*.gkb" + fx_ cprom x_ find "$grubdata/keymap" -type f -name "*.gkb" } add_uboot() -- cgit v1.2.1