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 --- mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk b/mk index a438d653..61d5d694 100755 --- a/mk +++ b/mk @@ -279,7 +279,7 @@ check_project_hashes() [ ! -f "$XBMK_CACHE/hash/$project$tree" ] || \ read -r old_pjhash < "$XBMK_CACHE/hash/$project$tree" - fx_ "x_ sha512sum" "$datadir" "$configdir/$tree" "$mdir" \ + fx_ "x_ sha512sum" find "$datadir" "$configdir/$tree" "$mdir" \ -type f -not -path "*/.git*/*" | awk '{print $1}' > \ "$xbmktmp/project.hash" || err "!h $project $tree" @@ -371,7 +371,7 @@ check_defconfig() elfcheck() { # TODO: *STILL* very hacky check. do it properly (based on build.list) - ( fx_ "exit 1" "$dest_dir" -type f ) || return 1; : + ( fx_ "exit 1" find "$dest_dir" -type f ) || return 1; : } handle_makefile() -- cgit v1.2.1 From 1390f7f800767dcba394ebbc4f7996508940639e Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 7 May 2025 14:19:15 +0100 Subject: mk: Create serprog tarballs here instead i simplified rom.sh to use mkhelper for actual image building. Signed-off-by: Leah Rowe --- mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') diff --git a/mk b/mk index 61d5d694..06e73ddc 100755 --- a/mk +++ b/mk @@ -87,6 +87,8 @@ build_release() cd "$srcdir" || err "$vdir: 2 !cd \"$srcdir\"" x_ ./mk -d coreboot mk -b coreboot pico-serprog stm32-vserprog pcsx-redux + + fe_ mkrom_tarball find bin -maxdepth 1 -type d -name "serprog_*" x_ mv bin ../roms ) || err "can't build rom images" -- 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 --- mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk b/mk index 06e73ddc..0c156523 100755 --- a/mk +++ b/mk @@ -88,7 +88,7 @@ build_release() x_ ./mk -d coreboot mk -b coreboot pico-serprog stm32-vserprog pcsx-redux - fe_ mkrom_tarball find bin -maxdepth 1 -type d -name "serprog_*" + fx_ mkrom_tarball x_ find bin -maxdepth 1 -type d -name "serprog_*" x_ mv bin ../roms ) || err "can't build rom images" -- cgit v1.2.1