Skip to content

chore: sync with armada-os upstream - #11

Merged
code002-2 merged 60 commits into
mainfrom
upstream-sync
Sep 13, 2026
Merged

code002-2 merged 60 commits into
mainfrom
upstream-sync

Conversation

@code002-2

Copy link
Copy Markdown
Owner

与 armada-os 上游的自动同步

本 fork 落后上游 59 个提交(领先 38 个 sheng 提交)。

上游新提交

51a873e chore(pkgs): bump kernel and inputplumber
500c270 Update konkr pfe hifi as well
2d95f4f feat(device): add AYN Thor Lite support
d3f5e5c chore(packages): bump packages for Thor Lite support
055214c Remove enale/disable sequence
4e07364 Update hifi conf
6136365 chore(rgb): bump pkg
d2b5e8e refactor(rgb): move rgb config from quirks to armada-rgb
a3fe638 chore(kernel): bump
b9dc28a feat: add support for Ayaneo Pocket S 1K profile
0b1fa6b Feature | Add DP Audio Out to Odin 3 and KPFE (#368)
0d0255b fix(sm8250): disable always on reg rp5/flip2
f292030 chore(mesa): bump mesa for qam fix
aeeb65d fix(decky): wait for Steam initialization before compatibility queries
b4de1d0 feat(packages): use pinned Steam client
e72a9d1 chore(kernel): bump
067af7c feat(armada-control): add global Follow Steam option
6c085af fix(armada-control): restore Proton dropdown on Steam beta
e2d4988 feat(installer): rewrite internal installer with verified local copying
67d0cc8 feat(ci): preview build index and downloads worker
7784dc7 fix(ci): fix preview registry auth
a47821e fix(ci): remove unnecessary dependency installs
b473d67 fix(ci): preserve PATH for nested disk build commands
54848e7 feat(ci): publish preview disk images to R2
7d86477 feat(recovery): change desktop hotkey to select and fix splash
e5732ce feat(recovery): boot time hotkey service
977defa feat(device-quirks): add inputplumber target list
169be55 fix(input): add expected targets to type
f882432 fix(input): set controller type on boot even with no config present
98ce921 fix(device-quirks): set ayaneo mode on KONKR devices
ca8eb5a feat(device-quirks): add dinput mode to ayaneo gamepad quirk
de2d5fb feat(input): drop upstreamed controllers
743cd7f feat(rp5): add support for visionox variant
765c716 feat(rp-flip2): add support for visionox variant
328b5a9 fix(store): Add home paths to flatpak filesystem overrides
7490047 feat(store): Add BigPEmu, MAME, PrimeHack and Ymir

文件变更统计

 .../inputplumber/capability_maps/retroid_mcu.yaml  |  269 ---
 .../inputplumber/devices/01-ayaneo-controller.yaml |    5 -
 .../inputplumber/devices/01-ayn-controller.yaml    |   50 -
 .../inputplumber/devices/02-ayn-controller.yaml    |   82 -
 .../devices/02-ayn-thor-controller.yaml            |   51 -
 .../devices/03-ayaneo-standard-controller.yaml     |   55 -
 .../devices/03-retroid-controller.yaml             |   38 -
 .../devices/04-retroid-flip2-controller.yaml       |   28 -
 .../inputplumber/devices/50-konkr_pf_elite.yaml    |   47 -
 .../wireplumber.conf.d/51-ayn-thor-lite.conf       |   37 +
 tests/armada-control-rgb-test.sh                   |   17 +-
 tests/boot-hotkeys-test.sh                         |  161 ++
 tests/disk-image-digest-test.sh                    |   93 +
 tests/esp-rename-test.sh                           |   14 -
 tests/installer-bootc-refs-test.sh                 |  113 --
 tests/installer-disk-test.py                       |   47 +
 tests/installer-gui-test.py                        |  133 ++
 tests/installer-source-test.py                     |  340 ++++
 tests/installer-test.py                            |  526 ++++++
 tests/installer-test.sh                            |    4 +
 tests/preview-image-publication-test.sh            |  142 ++
 tests/preview-image-retention-test.sh              |  202 +++
 tests/thor-virtual-keyboard-test.sh                |    1 +
 workers/downloads/.gitignore                       |    4 +
 workers/downloads/package-lock.json                | 1585 +++++++++++++++++
 workers/downloads/package.json                     |   13 +
 workers/downloads/worker.mjs                       |  141 ++
 workers/downloads/worker.test.mjs                  |  152 ++
 workers/downloads/wrangler.jsonc                   |   17 +
 96 files changed, 6031 insertions(+), 2904 deletions(-)

说明

由 workflow 自动创建;若显示 UNMERGEABLE,请手动解决冲突后合并。
如需重新拉取:sheng 侧的自动化更新请检查 build-sheng-container.yml / build-armada-export.yml。

FeralAI and others added 30 commits August 28, 2026 20:04
Enabled on the AYANEO Pocket DS and AYANEO Pocket S2
Forces controller type to be set to steam deck regardless of an existing config.
This is to override the upstream IP configs that default to xbox-series controllers
We had "keyboard" appended to every controller, but since this isnt always needed, and sometimes you have extra targets that are needed as well, this has been changed in favor of checking for extra targets before setting a controller type
feat(input): drop upstreamed controllers
feat(device-quirks): add dinput mode to ayaneo gamepad quirk
fix(device-quirks): set ayaneo mode on KONKR devices
fix(input): set controller type on boot even with no config present
fix(input): add expected targets to type
feat(device-quirks): add inputplumber target list
- System for mapping controller hotkeys to actions during boot
- First action is hold start for 3 seconds to force desktop mode
feat(recovery): boot time hotkey service
feat(ci): publish preview disk images to R2
fix(ci): preserve PATH for nested disk build commands
fix(ci): remove unnecessary dependency installs
feat(ci): preview build index and downloads worker
Replace the shell installer with Python, copying the exact running deployment and preserving bootc update metadata. Add partition safeguards, support replacing existing installations while preserving Android userdata, and improve touch storage sizing. Delegate uninstall to ABL.

Add source, partition, cleanup, and UI tests.
Steam beta removed the native compatibility-list methods, leaving Armada Control’s Proton dropdown empty.

Use CompatManager.GetCompatTools for newer clients while retaining native discovery on older clients. Normalize tool responses and preserve existing default selection, caching, and error handling.
fix(armada-control): restore Proton dropdown on Steam beta
Add a persistent Follow Steam choice to the global Proton dropdown. Migrate matching pins when enabling it, and unpinned Windows games when switching back, preserving other overrides and Linux routes.

Honor the choice in per-game defaults and resets, and hide Apply to New Games while active.
JPyke3 and others added 27 commits September 10, 2026 23:31
feat(packages): use pinned Steam client
fix(decky): wait for Steam initialization before compatibility queries
* Add updated audio tplg file along with m4 files for configuration and potential future updates

* Update Odin 3 Hifi conf for DP audio

* Gen Konkr TPLG and update audio conf

* chore(audio): keep topology sources out of firmware

* fix(audio): remove policy routing from UCM

---------

Co-authored-by: JPyke3 <github@pyk.ee>
Support for Ayaneo Pocket S 1k
Move rgb config from quirks to armada-rgb
feat(store): Add BigPEmu, MAME, PrimeHack and Ymir
Register the SM8250 DTB and dual-screen device profile, import the
final AYN Thor Lite UCM and WirePlumber configuration verbatim from
ROCKNIX, and reuse Armada's byte-identical Thor AW88166 firmware.

Upstream: https://github.com/ROCKNIX/distribution/tree/dbea089dd83e156babbbcabc677117cef08f1148
Upstream-PR: ROCKNIX/distribution#2724
Firmware-source: https://github.com/ROCKNIX/extra-firmware/tree/30c56e2f34af37fe372166b739d6ab277f5155b5

Co-authored-by: Philippe Simons <simons.philippe@gmail.com>
AYN Thor Lite Controller + Touch Screen
@code002-2
code002-2 merged commit 10e2229 into main Sep 13, 2026
1 check passed
code002-2 added a commit that referenced this pull request Sep 13, 2026
PR #11 was merged carrying conflict markers. Take upstream's null
(05ccd27 'restore default scheduler behavior') over the fork's older
explicit 'eevdf'.
code002-2 pushed a commit that referenced this pull request Sep 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants