From 8df90c30dda57dedc76015d397ef3b7e182b32ac Mon Sep 17 00:00:00 2001 From: maxjivi05 Date: Mon, 26 Oct 2026 13:02:45 -0400 Subject: [PATCH] fix(fex): read the fallback FEX version from droiddeck-fex-update The pin moved there from droiddeck-steam-x64, so the client settings sheet and its test read it from the new script. The x86-64 client notes now name the updater and Components' FEX watcher. --- .../com/droiddeck/launcher/ui/ModeSettingsDialog.kt | 4 ++-- .../java/com/droiddeck/launcher/ui/FexVersionTest.kt | 4 ++-- docs/development/x86-64-steam-client.md | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 86c03309f8..431858bf05 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -159,7 +159,7 @@ class ModeSettingsActions( val onDismiss: () -> Unit, ) -/** "2610 r3" from droiddeck-steam-x64's FEX_TAG line (fex-2610-r3), the build the x86-64 client downloads. */ +/** "2610 r3" from droiddeck-fex-update's FEX_TAG line (fex-2610-r3), the build x86 programs fall back to. */ internal fun fexVersionOf(script: String): String? = Regex("""(?m)^FEX_TAG=(fex-\d+-r\d+)\s*$""").find(script)?.let { fexVersionOfTag(it.groupValues[1]) } @@ -174,7 +174,7 @@ private fun x64FexVersion(context: android.content.Context): String? = remember runCatching { java.io.File(root, "usr/local/share/fex-emu/.droiddeck-tag").readText() }.getOrNull()?.let(::fexVersionOfTag) ?: com.droiddeck.launcher.session.FexCatalog.cached(context)?.tag?.let(::fexVersionOfTag) ?: runCatching { - context.assets.open("linuxfs/usr/local/bin/droiddeck-steam-x64").bufferedReader().use { fexVersionOf(it.readText()) } + context.assets.open("linuxfs/usr/local/bin/droiddeck-fex-update").bufferedReader().use { fexVersionOf(it.readText()) } }.getOrNull() } diff --git a/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt index 3d4600f8c1..0ee00d3ad4 100644 --- a/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/ui/FexVersionTest.kt @@ -20,8 +20,8 @@ class FexVersionTest { } @Test fun theShippedLauncherHasOne() { - val script = java.io.File("../tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64").takeIf { it.isFile } - ?: java.io.File("tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-x64") + val script = java.io.File("../tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update").takeIf { it.isFile } + ?: java.io.File("tools/linuxfs/overlay/usr/local/bin/droiddeck-fex-update") assertEquals(true, fexVersionOf(script.readText()) != null) } } diff --git a/docs/development/x86-64-steam-client.md b/docs/development/x86-64-steam-client.md index b3e2c5caf9..cf25613687 100644 --- a/docs/development/x86-64-steam-client.md +++ b/docs/development/x86-64-steam-client.md @@ -210,16 +210,17 @@ alone would then read as an installed client. build fails when a program in the package needs a library that is neither bundled nor listed in `tools/fex/runtime-libs.txt`). They were built and published in The412Banner/DroidDeck; up to r3 their tags point at that repository's `main`, from r4 at the commit each was built from. Later builds are versions on the single - `fex` release; `fex-2610-r5` stays published as the build `droiddeck-steam-x64` pins. + `fex` release; `fex-2610-r5` stays published as the build `droiddeck-fex-update` pins. - **Where the app gets it.** The app downloads FEX from Droid-Deck/DroidDeck-Components, where nothing is - uploaded by hand. The app follows its `fex.json`: while the x86-64 client is selected it reads it from - Components' `main` (directly, at most every ten minutes) and keeps the last copy, and a session passes - that build to `droiddeck-steam-x64` (`BL_FEX_TAG`, `BL_FEX_SHA256`, `BL_FEX_URLS` with the download + uploaded by hand. The app follows its `fex.json`: it reads it from + Components' `main` (directly, at most every ten minutes) and keeps the last copy, and every session passes + that build to `droiddeck-fex-update` (`BL_FEX_TAG`, `BL_FEX_SHA256`, `BL_FEX_URLS` with the download source's mirrors). The script installs a build only after its archive matches the sha256 and every program in it loads (`ld-linux --list`); the files it replaces are kept aside until the installed copy loads too and put back otherwise, and the tag is written last. Otherwise it keeps the installed one while that still loads, then falls back to `FEX_TAG`/`FEX_SHA256` built in, which stay the first-start default when no copy - of `fex.json` has been read. Publishing a FEX build therefore takes a Components run only; a + of `fex.json` has been read. Components' `watch-fex.yml` starts that run by itself every six hours once FEX-Emu + tags a release or `tools/fex` changes on `main`. Publishing a FEX build therefore takes a Components run only; a replaced archive cannot be pointed back to, so undoing a build means building an earlier ref. The rootfs is FEX-Emu's own image, unmodified: `fex-rootfs.json` there names its rootfs.fex-emu.gg link, sha256 and size, and `mirror-upstream.yml` fetches it into the catalog's release only when both match. A newer