D-Bus Phase 3/4: upgrade sessiond, services, add StatusNotifierWatcher, consolidate configs
- redbear-sessiond: add Manager.Inhibit (pipe FD), CanPowerOff/CanReboot/ CanSuspend/CanHibernate/CanHybridSleep/CanSleep (return na), PowerOff/ Reboot/Suspend stubs, GetSessionByPID, ListUsers, ListSeats, ListInhibitors, ActivateSession/LockSession/UnlockSession/TerminateSession - redbear-sessiond: add Session SetIdleHint, SetLockedHint, SetType, Terminate methods; wire PauseDevice/ResumeDevice/Lock/Unlock signal emission via SignalEmitter injection; add dynamic device enumeration scanning /scheme/drm/card* and /dev/input/event* at startup - redbear-sessiond: replace infinite pending() with stoppable shutdown via tokio watch channel + control socket shutdown command - redbear-upower: add Changed signal emission with 30s periodic polling and power state snapshot comparison - redbear-notifications: add ActionInvoked signal, expand capabilities to body + body-markup + actions - redbear-polkit, redbear-udisks: replace pending() with stoppable shutdown via signal handling + watch channel - Add redbear-statusnotifierwatcher: new session bus service implementing org.freedesktop.StatusNotifierWatcher for KDE system tray - Add D-Bus activation file for StatusNotifierWatcher - KWin session.cpp: try LogindSession before NoopSession fallback - Consolidate config profiles: remove obsolete redbear-desktop, redbear-kde, redbear-live-*, redbear-minimal-*, redbear-wayland configs; simplify to three supported targets (redbear-full, redbear-mini, redbear-grub) - Update DBUS-INTEGRATION-PLAN.md and DESKTOP-STACK-CURRENT-STATUS.md with Phase 3/4 fragility assessment, KWin readiness matrix, and completeness gap analysis
This commit is contained in:
+9
-42
@@ -2,57 +2,27 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
CONFIG_NAME="redbear-live"
|
||||
CONFIG_NAME="redbear-mini"
|
||||
ARCH="x86_64"
|
||||
ALLOW_UPSTREAM=0
|
||||
|
||||
canonicalize_live_config() {
|
||||
case "$1" in
|
||||
redbear-live-full)
|
||||
printf '%s\n' "redbear-live"
|
||||
;;
|
||||
redbear-live-mini-grub)
|
||||
printf '%s\n' "redbear-grub-live-mini"
|
||||
;;
|
||||
redbear-live-full-grub)
|
||||
printf '%s\n' "redbear-grub-live-full"
|
||||
;;
|
||||
redbear-grub-live-full)
|
||||
printf '%s\n' "redbear-grub-live-full"
|
||||
;;
|
||||
*)
|
||||
printf '%s\n' "$1"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
usage() {
|
||||
cat <<EOF
|
||||
Usage: $(basename "$0") [OPTIONS] [CONFIG_NAME] [ARCH]
|
||||
|
||||
Build a Red Bear OS live ISO for real bare metal.
|
||||
|
||||
Important:
|
||||
Live .iso outputs are for bare-metal boot/install/recovery workflows.
|
||||
They are not the virtual/QEMU target surface; use harddrive.img + make qemu for virtualization.
|
||||
|
||||
Options:
|
||||
--upstream Allow Redox/upstream recipe source refresh during build
|
||||
-h, --help Show this help
|
||||
|
||||
Supported live ISO targets:
|
||||
redbear-live Full live ISO (graphical greeter + text fallback)
|
||||
redbear-live-mini Text-only mini live ISO
|
||||
redbear-grub-live-mini Text-only mini live ISO with GRUB bootloader
|
||||
redbear-grub-live-full Full live ISO with GRUB bootloader
|
||||
|
||||
Legacy compatibility aliases:
|
||||
redbear-live-full → redbear-live
|
||||
redbear-live-mini-grub → redbear-grub-live-mini
|
||||
redbear-live-full-grub → redbear-grub-live-full
|
||||
Supported targets:
|
||||
redbear-full Full desktop ISO (Wayland + KDE + GPU drivers)
|
||||
redbear-mini Text-only ISO (default)
|
||||
redbear-grub Text-only ISO with GRUB boot manager
|
||||
|
||||
Defaults:
|
||||
CONFIG_NAME=redbear-live
|
||||
CONFIG_NAME=redbear-mini
|
||||
ARCH=x86_64
|
||||
EOF
|
||||
}
|
||||
@@ -93,14 +63,12 @@ fi
|
||||
[ ${#POSITIONAL[@]} -ge 1 ] && CONFIG_NAME="${POSITIONAL[0]}"
|
||||
[ ${#POSITIONAL[@]} -ge 2 ] && ARCH="${POSITIONAL[1]}"
|
||||
|
||||
CONFIG_NAME="$(canonicalize_live_config "$CONFIG_NAME")"
|
||||
|
||||
case "$CONFIG_NAME" in
|
||||
redbear-live|redbear-live-mini|redbear-grub-live-mini|redbear-grub-live-full)
|
||||
redbear-full|redbear-mini|redbear-grub)
|
||||
;;
|
||||
*)
|
||||
echo "ERROR: Unsupported live ISO target '$CONFIG_NAME'" >&2
|
||||
usage >&2
|
||||
echo "ERROR: Unsupported target '$CONFIG_NAME'" >&2
|
||||
echo "Supported: redbear-full, redbear-mini, redbear-grub" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@@ -122,4 +90,3 @@ fi
|
||||
|
||||
echo ""
|
||||
echo "Done: build/${ARCH}/${CONFIG_NAME}.iso"
|
||||
echo "Note: live .iso outputs are for real bare metal, not VM/QEMU use."
|
||||
|
||||
Reference in New Issue
Block a user