From 55f0dfe91da76684d5a79a90061e757d46c4c707 Mon Sep 17 00:00:00 2001 From: AskaEth Date: Wed, 2 Sep 2026 02:39:11 +0800 Subject: [PATCH] =?UTF-8?q?M6.2=20=E5=A4=87=E6=96=99:=20S89=20amsd.conf=20?= =?UTF-8?q?=E7=83=AD=E6=9B=B4=20exec=E2=86=92/usr/bin=20=E8=BF=81=E7=A7=BB?= =?UTF-8?q?;=20fw=5Fcontent=20=E6=94=B6=E7=BC=96=20launcher=2003dfcf76(?= =?UTF-8?q?=E9=94=81=E5=B1=8F+=E9=97=A8=E6=8E=A7+=E5=90=8D=E5=AD=97)/amsd?= =?UTF-8?q?=20026cad52(UTF-8=20=E5=90=8D=E5=AD=97)/S89=20a1ef9d65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- patch_v2/meow_svcd/S89meow_svcd | 8 +++++++- scripts/build/fw_content.conf | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/patch_v2/meow_svcd/S89meow_svcd b/patch_v2/meow_svcd/S89meow_svcd index 6399b91..fea519f 100755 --- a/patch_v2/meow_svcd/S89meow_svcd +++ b/patch_v2/meow_svcd/S89meow_svcd @@ -152,7 +152,13 @@ EOF2 echo -n "removed stale meow_route.conf " fi if [ -f /usr/data/meow/services.d/meow_amsd.conf ]; then - echo -n "amsd.conf exists " + # M6.2：热更期 exec 指 /usr/data 副本的存量 conf 迁移回 /usr/bin（同 powermgr/netmgrd 模式） + if grep -q '^exec=/usr/data/meow_amsd' /usr/data/meow/services.d/meow_amsd.conf && [ -x /usr/bin/meow_amsd ]; then + sed -i 's|^exec=/usr/data/meow_amsd|exec=/usr/bin/meow_amsd|' /usr/data/meow/services.d/meow_amsd.conf + echo -n "migrated amsd.conf exec->/usr/bin " + else + echo -n "amsd.conf exists " + fi else cat > /usr/data/meow/services.d/meow_amsd.conf <<'EOF' exec=/usr/bin/meow_amsd diff --git a/scripts/build/fw_content.conf b/scripts/build/fw_content.conf index e3b50ba..f55fabd 100644 --- a/scripts/build/fw_content.conf +++ b/scripts/build/fw_content.conf @@ -28,7 +28,7 @@ # ---- 用户态/服务守护二进制（usr/bin，全部 chmod 755 静态 MIPS）---- patch_v2/bootmenu/meow_bootmenu|/usr/bin/meow_bootmenu|4441822d87e76bfce2ce584604ac3830|引导选单 M2.85（sysui让位 agent-216） -patch_v2/meow_launcherd/meow_launcherd|/usr/bin/meow_launcherd|e6bdd0917eceabb0e0dd63446186539b|主屏 launcher M6.1（M4 后台播放+depends+274 amsd 拉起修复+286 设置页迁 netmgr IPC/WiFi 录入 UI+服务名统一 start meow_audiod） +patch_v2/meow_launcherd/meow_launcherd|/usr/bin/meow_launcherd|03dfcf7664cc73a93637dc8816a606e1|主屏 launcher M6.2（M6.1 全量+294 锁屏 PIN 全量+VOL_DOWN×3 强杀门控 !framework+显示名 UTF-8 整序列 name[49]） patch_v2/meow_watchdog/meow_watchdog|/usr/bin/meow_watchdog|553840cdc79d8d7bed766a5e3981ac57|应用看门狗 M2.97（音量反转 + DS1039 平方锥度 + 插孔消抖） patch_v2/meow_svcd/meow_svcd|/usr/bin/meow_svcd|605646c4cc93f2baf29071ea6bc870ea|服务管理器 M2.77（+崩溃上报 meow_crash agent-187） mips-repo/bins/meow_mdns/bin/meow_mdns|/usr/bin/meow_mdns|d6b0151bda26768f19952dae1342610d|mDNS 应答器 M2.78（启动竞态+换IP重检 agent-194） @@ -47,8 +47,8 @@ patch_v2/meow_netmgrd/meow_netmgrd|/usr/bin/meow_net|62369ebe29e7ef4b55067a0f14e # ---- 开机 init 脚本（etc/init.d，数字决定启动顺序，按文件名自然序）---- patch_v2/meow_sysui/S70meow_sysui|/etc/init.d/S70meow_sysui|e435affcb56499e5229728c6ae2524b9|sysui 自启 M2.85（launcher.conf enabled=1+迁移） -patch_v2/meow_svcd/S89meow_svcd|/etc/init.d/S89meow_svcd|74e4ab0e6348ce00c1dbc0e500e5d300|svcd 自启 M6.1（+服务名统一 meow_*：旧 audiod.conf/mdnsd.conf 迁移为 meow_audiod.conf/meow_mdns.conf，用户定案） -patch_v2/meow_amsd/meow_amsd|/usr/bin/meow_amsd|7ddc677ce7938bc9b95c83c17bc78295|活动管理器 M2.91（注册表自愈：卡未挂载扫空 3s 快重试+30s 合并重扫+am rescan；兼容旧 launcher 5 段 EV LAUNCH；agent-250）；M6.0 待打包：am start busy 识别修复（对照 launcher ACK 正幅度 busy=8，bool 误判二补 0xFFFFFFF8 导致 busy 落入 launcher offline） +patch_v2/meow_svcd/S89meow_svcd|/etc/init.d/S89meow_svcd|a1ef9d658d37bb7ed012cc9326840ac4|svcd 自启 M6.2（+amsd.conf 热更 exec→/usr/bin 迁移） +patch_v2/meow_amsd/meow_amsd|/usr/bin/meow_amsd|026cad52a855e693303882ed2b5224ee|活动管理器 M6.2（注册表自愈+busy 识别+显示名 UTF-8 整序列 name[49] 修面板 overview 非法 UTF-8） patch_v2/meow_amsd/am|/usr/bin/am|9e323faf1aeb0c6a6fb0425565cf525d|amsd 用户侧CLI（+resolve/picker/rescan） patch_v2/bootmenu/S90meow_bootmenu|/etc/init.d/S90meow_bootmenu|e0ace111ce5ee446a1e3c6605ac1e9c9|bootmenu 自启 M2.85（注释同步） patch_v2/bootmenu/S92_03_start_music_player|/etc/init.d/S92_03_start_music_player|c17257aa3d93f75da72903b57cbe1034|§4.3 兜底 patch（rcS 正常路径被 S90 阻塞不执行）