diff --git a/chv-guest/check_lockfile.py b/chv-guest/check_lockfile.py index 98bd1b8..4d39fdb 100644 --- a/chv-guest/check_lockfile.py +++ b/chv-guest/check_lockfile.py @@ -30,6 +30,16 @@ DECLARED_SOURCES = { "chv-cell": "repo_commit", "chv-broker": "repo_commit", "chv-browser": "repo_commit", + # 对齐 Muse P3 + P1 vsock:authd 三件套、authd/sentinel + # 叶子模块与 vsock 通知脚本,均是仓库内脚本,版本随 + # repo_commit。缺了它们 check 会报 contents 未覆盖(717efc4 + # 真机实测:6 项 unresolved,verify 与 check 双双失败)。 + "chv-authd": "repo_commit", + "git-credential-chv-authd": "repo_commit", + "chv-authd.service": "repo_commit", + "cloud/chv/authd.py": "repo_commit", + "cloud/chv/sentinel.py": "repo_commit", + "vsock_notify": "repo_commit", } diff --git a/chv-guest/generate_lockfile.py b/chv-guest/generate_lockfile.py index 8876799..5eb0ee2 100644 --- a/chv-guest/generate_lockfile.py +++ b/chv-guest/generate_lockfile.py @@ -51,6 +51,16 @@ DECLARED_SOURCES = { "chv-cell": "repo_commit", "chv-broker": "repo_commit", "chv-browser": "repo_commit", + # 对齐 Muse P3 + P1 vsock:authd 三件套、authd/sentinel + # 叶子模块与 vsock 通知脚本,均是仓库内脚本,版本随 + # repo_commit。缺了它们 generate 会记 6 项 unresolved, + # verify 与 check 双双失败(717efc4 真机实测)。 + "chv-authd": "repo_commit", + "git-credential-chv-authd": "repo_commit", + "chv-authd.service": "repo_commit", + "cloud/chv/authd.py": "repo_commit", + "cloud/chv/sentinel.py": "repo_commit", + "vsock_notify": "repo_commit", } diff --git a/cloud/tests/test_chv_residual.py b/cloud/tests/test_chv_residual.py index eb23d6a..fc26da3 100644 --- a/cloud/tests/test_chv_residual.py +++ b/cloud/tests/test_chv_residual.py @@ -418,7 +418,8 @@ class LockfileTest(unittest.TestCase): "openssh-client 1:9.9", "cloud-init 9.9", "python3 9.9", "python3-pip 9.9", "curl 9.9", "ca-certificates 9.9", "xz-utils 9.9", - "fonts-wqy-microhei 9.9", "fontconfig 9.9"] + "fonts-wqy-microhei 9.9", "fontconfig 9.9", + "systemd-container 9.9"] info = { "tag": "chv-guest-24.04-0.164.0-alpha.9-abc1234", "ubuntu": "24.04", @@ -432,6 +433,16 @@ class LockfileTest(unittest.TestCase): "fonts-wqy-microhei", "fontconfig", "codex", "codex-code-mode-host", "codex-resources/bwrap", "/app/host.py", "gt", "chv-sync", + # 与 717efc4 真实 BUILDINFO.contents 对齐: + # P2 三件套 + P3 authd 三件套 + 叶子模块 + + # vsock_notify(缺 DECLARED_SOURCES 登记时 + # generate 记 unresolved、verify/check 失败, + # 合成清单须覆盖才拦得住回归)。 + "systemd-container", "chv-cell", "chv-broker", + "chv-browser", "chv-authd", + "git-credential-chv-authd", "chv-authd.service", + "cloud/chv/authd.py", "cloud/chv/sentinel.py", + "vsock_notify", "playwright", "chromium-headless-shell"], "versions": {"dpkg": dpkg, "pip": ["playwright==9.9.9"],