Skip to content

Commit c976c70

Browse files
committed
fix: install the native CN sandbox backend by its package name
1 parent 0279594 commit c976c70

5 files changed

Lines changed: 30 additions & 4 deletions

File tree

‎.agents/docs/2026-10-08-llvm-2313-part2-execution-and-dependencies.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,3 +441,17 @@ Windows job `113112389601` 的线程源码摘要为
441441
复制到应用和计算摘要使用相同字节。该规则不改变摘要算法或运行断言。
442442
使用 `core.autocrlf=true` 的独立 checkout 验证 LF 字节及当前 JSON
443443
模板摘要一致;实际 Windows checkout 的验证由后续 CI 承担。
444+
445+
## 20. 2026-10-08 正式 CN 隔离后端包名更正
446+
447+
Ubuntu 的 `bwrap` 可执行文件由 `bubblewrap` 包供应。正式 CN 工作流
448+
与后端版本记录将 `bwrap` 映射为该包名,实际 SubOS 后端参数及路径
449+
继续使用 `bwrap`。`proot` 的包名与后端名相同。此更正保证所选后端
450+
的安装和来源记录一致;正式 CN 运行仍等待公开发布后的验收。
451+
452+
提交 `8131ca36` 与索引候选 `84c27c30` 的原生 GNU 验收运行
453+
`37717241617` 已成功。实际日志记录 147 个单测程序通过、四个真实
454+
索引成员通过,以及原生 openkal 的 JSON 和 TLS 双成功行。其
455+
mcpp-index 提交为 `b2f1e693248042c445c75fb020d49c428e6a1f78`。
456+
随后源码换行属性与 CN 包名修正不改变此原生引擎及应用源码的行为;
457+
该证据仍不替代最终四宿主目标运行与公开 CN 发布消费。

‎.github/tools/run_published_arm64_cn.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ cp "$base/data/xim-pkgindex/.xlings-index-cache.json" "$base/reports/outer-publi
4646
# ARM package. The published bwrap package is x86-only. The client locates the
4747
# system proot directly; bwrap's current locator needs this explicit private
4848
# system-backend directory. Record the symlink and actual distro version.
49-
dpkg-query -W "$backend" | tee "$base/reports/backend-version.txt"
49+
backend_package="$backend"
50+
[[ "$backend" != bwrap ]] || backend_package=bubblewrap
51+
dpkg-query -W "$backend_package" | tee "$base/reports/backend-version.txt"
5052
command -v "$backend" | tee "$base/reports/backend-path.txt"
5153
sha256sum "$(command -v "$backend")" > "$base/reports/backend.sha256"
5254
if [[ "$backend" == bwrap ]]; then

‎.github/workflows/ci-arm64-published-cn.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ jobs:
3737
set -euo pipefail
3838
test "$(uname -m)" = aarch64
3939
sudo apt-get update
40-
sudo apt-get install -y "$SANDBOX_BACKEND"
41-
dpkg-query -W "$SANDBOX_BACKEND"
40+
backend_package="$SANDBOX_BACKEND"
41+
[ "$SANDBOX_BACKEND" != bwrap ] || backend_package=bubblewrap
42+
sudo apt-get install -y "$backend_package"
43+
dpkg-query -W "$backend_package"
4244
- name: Exact public CN release in a cold real SubOS
4345
run: bash .github/tools/run_published_arm64_cn.sh "$RELEASE_VERSION" "$GITHUB_WORKSPACE" "$SANDBOX_BACKEND"
4446
- uses: actions/upload-artifact@v4

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
- Install explicitly requested toolchains for graph-supplied targets even when
2323
the host payload matrix cannot serve the target. Preserve the refusal for
2424
engine-selected foreign payloads.
25+
- Keep AArch64 host `std` modules and build programs on the same compiler-rt
26+
code-generation settings. Suppress the driver's automatic unwinder library
27+
when a self-contained ELF already links its static unwinder explicitly.
28+
- Stop E2E package discovery from exporting GCC's reserved `GCC_ROOT` variable,
29+
which redirected managed Windows GCC helper lookup to the registry wrapper.
30+
- Verify the native ARM64 openkal stack and indexed JSON serialization and
31+
parsing, hosted TLS, thread destruction and concurrent exception unwinding
32+
in the four-host cross-target matrix.
2533
- Cover both xcode-27 E2E shards and exercise explicit toolchain installation
2634
with a cold registry. Restore historical measurements to their original
2735
environment and adapt the namespace fixture to libc++ 23.

‎docs/specs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
| [SPEC-006](toolchain-management.md) | 工具链管理:身份、来源、选择与载荷契约 | 草案 v0.6 | 2026-10-02 | 逐条标注;已实现条款 mcpp >= 2026.9.24.1;§3.7 mcpp >= 2026.9.28.1;§3.7.1 mcpp >= 2026.9.28.2;§2.2.1 与 §3.3 的非缺省来源 mcpp >= 2026.10.1.3 |
3939
| [SPEC-007](build-plugins.md) | 构建插件:配置、施工与校验的分工,运行时与规划期的义务 | 草案 v0.6 | 2026-09-28 | 逐条标注;mcpp >= 2026.9.26.2;v0.3 条款 mcpp >= 2026.9.27.1;v0.4 条款 mcpp >= 2026.9.28.1;v0.5 条款 mcpp >= 2026.9.28.2;v0.6(§9)mcpp >= 2026.9.28.3 |
4040
| [SPEC-008](library-interface.md) | 库的接口:公开模块、发布闭包与两种形态的一致 | 草案 v0.1 | 2026-09-28 | 第一阶段(只警告)mcpp >= 2026.9.28.3 |
41-
| [SPEC-009](toolchain-maintenance.md) | 工具链的支持与维护:版本线、默认值、来源、移动与退役 | 草案 v0.3 | 2026-10-05 | 逐条标注;本版只有规范,多数条款未实现 |
41+
| [SPEC-009](toolchain-maintenance.md) | 工具链的支持与维护:版本线、默认值、来源、移动与退役 | 草案 v0.5 | 2026-10-08 | 逐条标注;本版只有规范,多数条款未实现 |
4242

4343
## 文档约定
4444

0 commit comments

Comments
 (0)