diff options
author | Leah Rowe <leah@libreboot.org> | 2025-05-08 09:14:19 +0100 |
---|---|---|
committer | Leah Rowe <leah@libreboot.org> | 2025-05-08 09:14:19 +0100 |
commit | d9e8923ff4e58ecd182dbb3b8eb6b6fe657e6eb5 (patch) | |
tree | 18d51b90ebcdaa90f0b9cfcc0137f52f38d24ab1 /mk | |
parent | 0a93c8238847fc3f595d7431c8a2e12f0603a6ef (diff) | |
parent | 2cea8517f3b6c7f72cdecbcd3e6745db29284852 (diff) |
Merge branch 'master' into 25.04_branch
Diffstat (limited to 'mk')
-rwxr-xr-x | mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 + + fx_ mkrom_tarball x_ find bin -maxdepth 1 -type d -name "serprog_*" x_ mv bin ../roms ) || err "can't build rom images" @@ -279,7 +281,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 +373,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() |