dshm-compat 0.1.6 → 0.1.8

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.1.8
+
+- Fixed the x86_64 worker launch: QEMU's `-L <rootfs>` prefixes absolute guest
+  paths with the glibc rootfs, so `dsh-ops` could not see `/storage/...` or
+  `/data/...` even though the guest mounts existed. The wrapper now runs
+  `ld-linux-x86-64.so.2 --library-path <rootfs>/lib/x86_64-linux-gnu <worker>`
+  directly, so guest absolute paths are passed through unchanged.
+- Kept the host app-files prefix symlink for workers that canonicalize the host
+  `policy.workspaceRoot`.
+- Offline regression suite: 30/30.
+
+## 0.1.7
+
+- Re-release of the 0.1.6 content. npm accepted 0.1.6 into staged publishing but
+  it never became visible (404), and npm refuses to publish over a staged
+  version. 0.1.7 is the installable build.
+- Native worker wrappers bridge the DSHM host app-files prefix
+  `/data/storage/el2/base/haps/entry/files` to the guest's `/mnt/share` 9p
+  mount. `dsh-ops` passes the host `policy.workspaceRoot` as the worker's
+  `root`; the worker canonicalizes it before doing anything, so an unmapped
+  host path made every `ops_*` call fail with `NOT_FOUND` even when the guest
+  path existed. The wrapper creates the symlink only when the guest mount
+  exists and the host prefix is absent.
+- Offline regression suite: 30/30.
+
 ## 0.1.6
 
 - Native worker wrappers now bridge the DSHM host app-files prefix

package/INSTALL.md

@@ -1,6 +1,6 @@
 # Installing dshm-compat
 
-The artifact is a normal DSH bundle package: `dshm-compat-0.1.6.tgz`.
+The artifact is a normal DSH bundle package: `dshm-compat-0.1.8.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.6` in its bash tool (the
+- ask the DSHM Agent to run `pnpm add dshm-compat@0.1.8` 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.6.tgz` on any HTTPS host (GitHub Release, Gitee Release,
+Put `dshm-compat-0.1.8.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.6.tgz /data/storage/el2/base/haps/entry/files/dshm-compat-0.1.6.tgz
+hdc file send dshm-compat-0.1.8.tgz /data/storage/el2/base/haps/entry/files/dshm-compat-0.1.8.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.6.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.8.tgz'
 ```
 
 If the profile reports `ERR_PNPM_UNEXPECTED_VIRTUAL_STORE`, its `node_modules`

package/README.md

@@ -5,8 +5,10 @@ them through the least invasive strategy that can work.
 
 ## Current phase
 
-0.1.6 bridges the host app-files prefix to the guest `/mnt/share` mount for
-native worker roots, fixing `NOT_FOUND` from `ops_*`. 0.1.5 added non-`-c`
+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`
 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

@@ -244,7 +244,7 @@ export async function convertS2Native(spec, options = {}) {
         'set -e',
         ...hostFilesLink,
         'DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)',
-        `exec "$DIR/qemu-x86_64" -L "$DIR/rootfs" "$DIR/${realName}" "$@"`,
+        `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}" "$@"`,
         '',
       ].join('\n'))
       workerSource = 'x86_64 worker executed through the bundled qemu-x86_64 and glibc rootfs'
@@ -291,6 +291,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'] : []),
   ]
 
   const output = files.filter(file => file.path !== workerPath).map(file => {

package/package.json

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