dshm-compat 0.1.8 → 0.1.10

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 0.1.10
+
+- The generic S2 adapter now prefers an AArch64 worker when a package contains
+  both `runtime/linux-arm64` and `runtime/linux-x64`, instead of taking the
+  first file. Native AArch64 avoids the QEMU user-mode `openat2`/9p no-follow
+  behavior that makes `ops_stat` return `ELOOP`.
+- x86_64 QEMU conversions now carry a warning that no-follow stat on 9p
+  mountpoints can fail with `ELOOP`; provide an AArch64 worker for that class.
+- Offline regression suite: 31/31.
+
+## 0.1.9
+
+- Fixed the 0.1.8 launch regression. Running `ld-linux` as the QEMU main binary
+  produced `Exec format error`; the wrapper now copies the x86_64 loader and
+  glibc libraries into the guest's real `/lib64` and `/lib/x86_64-linux-gnu`,
+  then runs `qemu-x86_64 <worker>` **without** `-L`. Absolute guest paths are no
+  longer prefixed, while the worker still gets its host-root symlink bridge.
+  If `/lib` is not writable, it falls back to `qemu -L` with rootfs symlinks.
+- Offline regression suite: 30/30.
+
 ## 0.1.8
 
 - Fixed the x86_64 worker launch: QEMU's `-L <rootfs>` prefixes absolute guest

package/INSTALL.md

@@ -1,6 +1,6 @@
 # Installing dshm-compat
 
-The artifact is a normal DSH bundle package: `dshm-compat-0.1.8.tgz`.
+The artifact is a normal DSH bundle package: `dshm-compat-0.1.10.tgz`.
 It is host-only, has no runtime dependencies, and adds twelve agent tools.
 
 ## A. DSHM (the tablet)
@@ -15,7 +15,7 @@ input calls `pnpm view` before installing and fails with
 `Command failed with EACCES: pnpm view ... spawn pnpm EACCES`. Use one of these
 instead:
 
-- ask the DSHM Agent to run `pnpm add dshm-compat@0.1.8` in its bash tool (the
+- ask the DSHM Agent to run `pnpm add dshm-compat@0.1.10` in its bash tool (the
   bundled pnpm shim routes that command to the host install queue); or
 - install from a GitHub repository URL; or
 - after any working install, use the plugin's own `compat_install` tool for
@@ -28,7 +28,7 @@ not accept local paths, `file:` or `http://` specs.
 
 ### A2. HTTPS tarball
 
-Put `dshm-compat-0.1.8.tgz` on any HTTPS host (GitHub Release, Gitee Release,
+Put `dshm-compat-0.1.10.tgz` on any HTTPS host (GitHub Release, Gitee Release,
 object storage) and paste the `.tgz` URL into the same Add plugin input. DSHM's
 installer accepts tarball specs; if the current market UI refuses a plain URL,
 use A1.
@@ -38,7 +38,7 @@ use A1.
 If `hdc` is available and the app can read the path:
 
 ```sh
-hdc file send dshm-compat-0.1.8.tgz /data/storage/el2/base/haps/entry/files/dshm-compat-0.1.8.tgz
+hdc file send dshm-compat-0.1.10.tgz /data/storage/el2/base/haps/entry/files/dshm-compat-0.1.10.tgz
 ```
 
 Then enter the absolute path (or `file:/...`) in the Add plugin input. This
@@ -47,7 +47,7 @@ depends on the DSHM build's local-file support; A1 is safer.
 ## B. Desktop DSH (for testing only)
 
 ```powershell
-& 'D:\安装\dsh-desktop\resources\runtime\cli\bin\dsh.cmd' plugin --profile desktop add 'D:\dsh\dsh-26-09-30\dshm-compat\dshm-compat-0.1.8.tgz'
+& 'D:\安装\dsh-desktop\resources\runtime\cli\bin\dsh.cmd' plugin --profile desktop add 'D:\dsh\dsh-26-09-30\dshm-compat\dshm-compat-0.1.10.tgz'
 ```
 
 If the profile reports `ERR_PNPM_UNEXPECTED_VIRTUAL_STORE`, its `node_modules`

package/README.md

@@ -5,10 +5,13 @@ them through the least invasive strategy that can work.
 
 ## Current phase
 
-0.1.8 fixes the x86_64 worker launch: QEMU's `-L` prefixed guest absolute
-paths with the glibc rootfs, so every host path looked missing. The wrapper now
-runs `ld-linux --library-path` directly. It also keeps the host app-files prefix
-bridge to `/mnt/share` for native worker roots. 0.1.5 added non-`-c`
+0.1.10 prefers a native AArch64 worker when both architectures are present, so
+QEMU's 9p/no-follow `ELOOP` limitation does not apply. 0.1.9 installs the x86_64
+loader and glibc libraries into the guest's real `/lib64` and
+`/lib/x86_64-linux-gnu`, then runs `qemu-x86_64` without `-L`. This avoids
+QEMU's absolute-path prefixing (0.1.7 `NOT_FOUND`) and the 0.1.8 `ld-linux`
+`Exec format error`. The host app-files prefix bridge to `/mnt/share` is kept
+for worker roots. 0.1.5 added non-`-c`
 spawn wrappers, release fallbacks, and `compat_uninstall`; 0.1.4 added the
 generic S2 adapter with x86_64 QEMU and GitHub Release acquisition. Phase 1
 ships the analyzer, the S0/S1 converter, the generic S2 engine, guest

package/lib/s2-native.js

@@ -89,13 +89,15 @@ export async function convertS2Native(spec, options = {}) {
     }
   }
   if (workerBinary === undefined) {
-    const candidate = files.find(file => file.type === 'file'
-      && /^runtime\/linux-(?:arm64|x64)\//.test(file.path)
-      && !file.path.endsWith('/provenance.json')
-      && elfArch(file.data) !== undefined)
-    if (candidate !== undefined) {
-      workerBinary = candidate.data
-      workerName = basename(candidate.path)
+    const candidates = files
+      .filter(file => file.type === 'file'
+        && /^runtime\/linux-(?:arm64|x64)\//.test(file.path)
+        && !file.path.endsWith('/provenance.json')
+        && elfArch(file.data) !== undefined)
+      .sort((a, b) => (elfArch(a.data) === 'arm64' ? 0 : 1) - (elfArch(b.data) === 'arm64' ? 0 : 1))
+    if (candidates.length > 0) {
+      workerBinary = candidates[0].data
+      workerName = basename(candidates[0].path)
     }
   }
   let acquiredAsset
@@ -244,7 +246,15 @@ export async function convertS2Native(spec, options = {}) {
         'set -e',
         ...hostFilesLink,
         'DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)',
-        `exec "$DIR/qemu-x86_64" "$DIR/rootfs/lib64/ld-linux-x86-64.so.2" --library-path "$DIR/rootfs/lib/x86_64-linux-gnu" "$DIR/${realName}" "$@"`,
+        'ROOTFS="$DIR/rootfs"',
+        'if mkdir -p /lib64 /lib/x86_64-linux-gnu 2>/dev/null \\',
+        '   && cp -f "$ROOTFS/lib64/ld-linux-x86-64.so.2" /lib64/ld-linux-x86-64.so.2 2>/dev/null \\',
+        '   && cp -f "$ROOTFS/lib/x86_64-linux-gnu/libc.so.6" /lib/x86_64-linux-gnu/libc.so.6 2>/dev/null \\',
+        '   && cp -f "$ROOTFS/lib/x86_64-linux-gnu/libgcc_s.so.1" /lib/x86_64-linux-gnu/libgcc_s.so.1 2>/dev/null; then',
+        `  exec "$DIR/qemu-x86_64" "$DIR/${realName}" "$@"`,
+        'fi',
+        'for d in storage mnt data; do [ -e "$ROOTFS/$d" ] || ln -s "/$d" "$ROOTFS/$d" 2>/dev/null || true; done',
+        `exec "$DIR/qemu-x86_64" -L "$ROOTFS" "$DIR/${realName}" "$@"`,
         '',
       ].join('\n'))
       workerSource = 'x86_64 worker executed through the bundled qemu-x86_64 and glibc rootfs'
@@ -291,7 +301,7 @@ export async function convertS2Native(spec, options = {}) {
       ? `staged ${workerName} as a shell wrapper over qemu-x86_64 + glibc rootfs`
       : `staged ${workerName} as a shell wrapper over ${workerName}-bin`,
     'mapped /data/storage/el2/base/haps/entry/files to the guest /mnt/share mount',
-    ...(workerArch === 'x64' ? ['ran the x86_64 loader directly instead of qemu -L, so guest absolute paths are not prefixed with the glibc rootfs'] : []),
+    ...(workerArch === 'x64' ? ['prefers guest-native x86_64 loader/libs; falls back to qemu -L only when /lib is not writable'] : []),
   ]
 
   const output = files.filter(file => file.path !== workerPath).map(file => {
@@ -318,7 +328,10 @@ export async function convertS2Native(spec, options = {}) {
     bytes: packed.length,
     sha256: createHash('sha256').update(packed).digest('hex'),
     changed,
-    warnings: validation.warnings,
+    warnings: [
+      ...(workerArch === 'x64' ? ['the worker runs under QEMU; no-follow stat on 9p mountpoints can return ELOOP. Prefer an AArch64 worker when one is available.'] : []),
+      ...(validation.warnings ?? []),
+    ],
     validation,
     worker: { target: workerArch === 'arm64' ? TARGET : 'x86_64-linux-gnu', arch: workerArch, sha256 },
     ...(acquisition?.ok === true ? { acquisition: { asset: acquisition.asset, sha256: acquisition.sha256 } } : {}),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dshm-compat",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Analyze and convert DSH plugins that cannot be installed or run on HarmonyOS DSHM.",
   "type": "module",
   "main": "index.js",