feat(x11): migrate to pure Xlibre + dwm/dmenu/st stack, fix fcitx5-t9 bottom bar, PM8909 PON shutdown, and remove Wayland

This commit is contained in:
Luxferre
2026-10-20 21:15:16 +03:00
parent ad012360c3
commit 7bab7b7a11
422 changed files with 63226 additions and 2342 deletions
+51 -2
View File
@@ -42,8 +42,11 @@ esac
echo "[1/4] Installing Bananarchy rootfs overlay (artwork, branding, Sxmo 240x320, UCM, udev)..."
rm -f "$TARGET_ROOTFS/usr/bin/bantam" "$TARGET_ROOTFS/usr/local/bin/bantam" "$TARGET_ROOTFS/etc/doas.d/wheel.conf"
cp -af "$BASE_DIR/overlay/rootfs/." "$TARGET_ROOTFS/"
chown -R 10000:10000 "$TARGET_ROOTFS/home/user" 2>/dev/null || true
chown 0:0 "$TARGET_ROOTFS/etc/doas.d/50-sxmo.conf" 2>/dev/null || true
chmod 640 "$TARGET_ROOTFS/etc/doas.d/50-sxmo.conf" 2>/dev/null || true
chown 0:0 "$TARGET_ROOTFS/usr/bin/sudo" "$TARGET_ROOTFS/usr/bin/doas" "$TARGET_ROOTFS/bin/su" 2>/dev/null || true
chmod 4755 "$TARGET_ROOTFS/usr/bin/sudo" "$TARGET_ROOTFS/usr/bin/doas" "$TARGET_ROOTFS/bin/su" 2>/dev/null || true
echo "[2/4] Installing prebuilt QDSP6/Q6Voice kernel modules, torch LED module, camera module, and DTBs..."
if [ -d "$TARGET_ROOTFS/lib/modules/6.12.1-msm8916/kernel/sound/soc/qcom/qdsp6" ]; then
@@ -65,14 +68,60 @@ mkdir -p "$TARGET_ROOTFS/boot/dtbs"
cp -af "$BASE_DIR/prebuilt/kernel-6.12.1-msm8916/dtbs/"*.dtb "$TARGET_ROOTFS/boot/dtbs/"
cp -af "$BASE_DIR/prebuilt/kernel-6.12.1-msm8916/dtbs/$DTB_FILE" "$TARGET_ROOTFS/boot/$DTB_FILE"
echo "[3/4] Installing prebuilt multi-mode fcitx5-t9 and Bantam AI agent..."
echo "[3/4] Installing prebuilt Xlibre, Sxmo X11 (dwm/dmenu/st), fcitx5-t9, and Bantam AI agent..."
if [ -d "$BASE_DIR/prebuilt/xlibre/usr" ]; then
cp -af "$BASE_DIR/prebuilt/xlibre/usr/bin/." "$TARGET_ROOTFS/usr/bin/"
cp -af "$BASE_DIR/prebuilt/xlibre/usr/lib/xorg/." "$TARGET_ROOTFS/usr/lib/xorg/"
cp -af "$BASE_DIR/prebuilt/xlibre/usr/share/X11/xorg.conf.d/." "$TARGET_ROOTFS/usr/share/X11/xorg.conf.d/"
fi
if [ -d "$BASE_DIR/prebuilt/sxmo-x11/usr" ]; then
cp -af "$BASE_DIR/prebuilt/sxmo-x11/usr/." "$TARGET_ROOTFS/usr/"
fi
cp -af "$BASE_DIR/prebuilt/fcitx5-t9/usr/." "$TARGET_ROOTFS/usr/"
cp -af "$BASE_DIR/prebuilt/bantam/bantam" "$TARGET_ROOTFS/usr/bin/bantam"
cp -af "$BASE_DIR/prebuilt/bantam/bantam" "$TARGET_ROOTFS/usr/local/bin/bantam"
rm -f \
rm -rf \
"$TARGET_ROOTFS/usr/bin/sxmo_swayinitconf.sh" \
"$TARGET_ROOTFS/usr/bin/sxmo_swayinit.sh" \
"$TARGET_ROOTFS/usr/bin/sxmo_riverinit.sh" \
"$TARGET_ROOTFS/usr/bin/sxmo_riverbar.sh" \
"$TARGET_ROOTFS/usr/bin/bemenu" \
"$TARGET_ROOTFS/usr/bin/bemenu-run" \
"$TARGET_ROOTFS/usr/lib/bemenu" \
"$TARGET_ROOTFS/usr/share/wayland-sessions" \
"$TARGET_ROOTFS/usr/share/sxmo/appcfg/sway_template" \
"$TARGET_ROOTFS/usr/share/sxmo/appcfg/wob.ini" \
"$TARGET_ROOTFS/usr/share/sxmo/appcfg/river" \
"$TARGET_ROOTFS/usr/share/sxmo/appcfg/wofi.config" \
"$TARGET_ROOTFS/usr/share/sxmo/appcfg/wofi.css" \
"$TARGET_ROOTFS/usr/share/sxmo/appcfg/foot.ini" \
"$TARGET_ROOTFS/usr/share/sxmo/sessions/sxmo_river.desktop" \
"$TARGET_ROOTFS/usr/share/sxmo/services/sxmo_riverbar.service" \
"$TARGET_ROOTFS/usr/share/sxmo/services/sxmo_wob.service" \
"$TARGET_ROOTFS/usr/share/sxmo/appscripts/sxmo_record.sh" \
"$TARGET_ROOTFS/usr/share/sxmo/appscripts/sxmo_screenshot.sh" \
"$TARGET_ROOTFS/usr/share/sxmo/appscripts/sxmo_websearch.sh" \
"$TARGET_ROOTFS/usr/share/sxmo/appscripts/sxmo_youtube.sh" \
"$TARGET_ROOTFS/usr/share/sxmo/appscripts/sxmo_youtube_audio.sh" \
"$TARGET_ROOTFS/usr/lib/fcitx5/libwayland.so" \
"$TARGET_ROOTFS/usr/lib/fcitx5/libwaylandim.so" \
"$TARGET_ROOTFS/usr/share/fcitx5/addon/wayland.conf" \
"$TARGET_ROOTFS/usr/share/fcitx5/addon/waylandim.conf" \
"$TARGET_ROOTFS/home/user/.config/fcitx5/conf/waylandim.conf" \
"$TARGET_ROOTFS/etc/skel/.config/fcitx5/conf/waylandim.conf" \
"$TARGET_ROOTFS/home/user/.config/wob" \
"$TARGET_ROOTFS/etc/skel/.config/wob" \
"$TARGET_ROOTFS/home/user/.config/wofi" \
"$TARGET_ROOTFS/etc/skel/.config/wofi" \
"$TARGET_ROOTFS/home/user/.config/foot" \
"$TARGET_ROOTFS/etc/skel/.config/foot" \
"$TARGET_ROOTFS/home/user/.config/sxmo/sway" \
"$TARGET_ROOTFS/etc/skel/.config/sxmo/sway" \
"$TARGET_ROOTFS/home/user/.bantam.cfg" \
"$TARGET_ROOTFS/etc/skel/.bantam.cfg" \
"$TARGET_ROOTFS/root/.bantam.cfg"
mkdir -p "$TARGET_ROOTFS/var/lib/tinydm"
ln -sf /usr/share/xsessions/sxmo.desktop "$TARGET_ROOTFS/var/lib/tinydm/default-session.desktop"
echo "[4/4] Installing deviceinfo for $DEVICE ($DTB_FILE)..."
if [ -f "$BASE_DIR/devices/$DEVICE/deviceinfo" ]; then