fix(build): M56 r1 评审三条 P2 + 一条观察(脚本权限/可复现口径注释/watchdog 参数去内联+入门禁/REPACK 显式失败)
- P2-1 repack_repro.sh 提交为 100755(scripts/build/ 下唯一非 755 的 .sh,而头注释就让人直接执行) - P2-2 注释与事实对齐:写明 squashfs/分片/ota_update.in 可复现,但 .upt 仍有 93 字节 Rock Ridge TF backup date 差异(genisoimage 无覆盖开关),验收口径仍是 体积+unpack 0 diff+进包 md5 - P2-3 watchdog 参数不再内联复制:build_watchdog.sh 认 ZIGCC(照 build_netmgrd.sh 口径), rebuild_binaries.sh 改成调它;meow_watchdog 加入 test_time32_abi.sh 的 BUILD_TARGETS(11 个)。 改后重编仍逐字节 25f769509a43d0f66287efd456c64281 / 100116,与内联那版一致 - 观察1:REPACK 显式指定但不存在 -> exit 1(此前会静默回退到不可复现的旧 repack.sh)
This commit is contained in:
1 parent
d34406ac22
commit
28fbc6094a
5 files changed
+36
-16
No files matched your search
@@ -144,11 +144,10 @@ echo " ZIG=$ZIG ($("$ZIG" version 2>/dev/null || echo '?'))"
|
||||
[ "$do_audiod" = 1 ] && { run audiod patch_v2/meow_audiod bash build_audiod.sh; report patch_v2/meow_audiod/meow_audiod; }
|
||||
[ "$do_audio" = 1 ] && { run audio patch_v2/meow_audiod bash build_audiod.sh cli; report patch_v2/meow_audiod/meow_audio; }
|
||||
[ "$do_launcherd" = 1 ] && { ensure_ui_a; run launcherd patch_v2/meow_launcherd bash build_launcher.sh; report patch_v2/meow_launcherd/meow_launcherd; }
|
||||
# watchdog:不走 build_watchdog.sh —— 它按自身位置推 ROOT=../.. 再取 <root>/.tools/zig-mipsel-cc,
|
||||
# 该符号链接只在主 checkout 里(worktree 没有),直接跑会「找不到编译器」。这里按它的同一组参数
|
||||
# (-Os -Wall -Wextra -static + MEOW_TIME32_LIBC_OVERRIDES + ../sdk/meow_time32.c)显式调用 $ZIGCC。
|
||||
[ "$do_watchdog" = 1 ] && { run watchdog patch_v2/meow_watchdog "$ZIGCC" -Os -Wall -Wextra -static \
|
||||
-I../meow_launcherd -DMEOW_TIME32_LIBC_OVERRIDES meow_watchdog.c ../sdk/meow_time32.c -o meow_watchdog
|
||||
# watchdog:走它自己的 build_watchdog.sh(编译参数只有一份,改脚本即改批次)。
|
||||
# 该脚本的 CC 认 ZIGCC env(M56 r1 起的口径),所以 worktree 里 <root>/.tools 不存在也能编;
|
||||
# 这里显式传 ZIGCC=,与其余组件同一个编译器,不再内联复制参数。
|
||||
[ "$do_watchdog" = 1 ] && { run watchdog patch_v2/meow_watchdog env ZIGCC="$ZIGCC" bash build_watchdog.sh
|
||||
report patch_v2/meow_watchdog/meow_watchdog; }
|
||||
|
||||
echo "==> 完成。产物自证:bash scripts/build/verify_fingerprints.sh"
|
||||
Reference in new issue
Block a user