From dc68822bcbb4204982b052f362121d4c81c39851 Mon Sep 17 00:00:00 2001 From: Vasilito Date: Fri, 17 Apr 2026 00:04:27 +0100 Subject: [PATCH] Refresh Red Bear profile configs Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Sisyphus --- config/my-amd-desktop.toml | 1 - config/redbear-device-services.toml | 3 +++ config/redbear-kde.toml | 22 +++------------------- config/redbear-wayland.toml | 3 ++- recipes/core/base-initfs/recipe.toml | 3 ++- 5 files changed, 10 insertions(+), 22 deletions(-) delete mode 120000 config/my-amd-desktop.toml diff --git a/config/my-amd-desktop.toml b/config/my-amd-desktop.toml deleted file mode 120000 index bd55382c..00000000 --- a/config/my-amd-desktop.toml +++ /dev/null @@ -1 +0,0 @@ -/mnt/data/homes/kellito/Builds/redox-master/local/config/my-amd-desktop.toml \ No newline at end of file diff --git a/config/redbear-device-services.toml b/config/redbear-device-services.toml index 5e9f0c9e..7e122582 100644 --- a/config/redbear-device-services.toml +++ b/config/redbear-device-services.toml @@ -2,6 +2,9 @@ # # Shared by profiles that ship the firmware/input/Wi-Fi control compatibility stack. +[packages] +redbear-quirks = {} + [[files]] path = "/lib/firmware" data = "" diff --git a/config/redbear-kde.toml b/config/redbear-kde.toml index 704f662c..225e6ddc 100644 --- a/config/redbear-kde.toml +++ b/config/redbear-kde.toml @@ -3,7 +3,8 @@ # Live: make live CONFIG_NAME=redbear-kde # # KDE Plasma 6 session with Wayland compositor -# Requires: D-Bus, libinput, Mesa, Qt6, KF6, KWin, plasma-workspace +# Current state: KWin + KF6 + Qt6 + Mesa + D-Bus + seatd +# Future: add plasma-workspace, plasma-desktop when their deps are resolved include = ["desktop.toml", "redbear-legacy-base.toml", "redbear-legacy-desktop.toml", "redbear-device-services.toml", "redbear-netctl.toml"] @@ -89,7 +90,7 @@ kf6-kcmutils = {} kf6-kwayland = {} kdecoration = {} -# KDE session surface (Phase 6 slice) +# KDE session surface (v2.0 Phases 3–4) kwin = {} # Graphics @@ -131,18 +132,6 @@ data = "" directory = true mode = 0o755 -[[files]] -path = "/var/lib/dbus" -data = "" -directory = true -mode = 0o755 - -[[files]] -path = "/run/dbus" -data = "" -directory = true -mode = 0o755 - [[files]] path = "/usr/lib/init.d/13_seatd.service" data = """ @@ -251,11 +240,6 @@ fi # Start D-Bus session bus eval $(dbus-launch --sh-syntax) -# Start KWin Wayland compositor -kwin_wayland --replace & - -sleep 2 - # Start KWin Wayland compositor kwin_wayland --replace """ diff --git a/config/redbear-wayland.toml b/config/redbear-wayland.toml index f8f8cbc8..6d84d2cc 100644 --- a/config/redbear-wayland.toml +++ b/config/redbear-wayland.toml @@ -1,7 +1,8 @@ # Red Bear OS Wayland Validation Profile # # Build: ./local/scripts/build-redbear.sh redbear-wayland -# Run: ./local/scripts/test-phase4-wayland-qemu.sh +# Phase 1 substrate validation: ./local/scripts/test-phase1-desktop-substrate.sh --qemu redbear-wayland +# Phase 2 Wayland validation: ./local/scripts/test-phase4-wayland-qemu.sh include = ["wayland.toml"] diff --git a/recipes/core/base-initfs/recipe.toml b/recipes/core/base-initfs/recipe.toml index 237dfe0c..4baf748f 100644 --- a/recipes/core/base-initfs/recipe.toml +++ b/recipes/core/base-initfs/recipe.toml @@ -95,7 +95,7 @@ done cp "${COOKBOOK_SYSROOT}/usr/bin/redoxfs" "${COOKBOOK_BUILD}/initfs/bin" ARCH="$(echo "${GNU_TARGET}" | cut -d - -f1)" -RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static" cargo \ +RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static -Clink-arg=-nostartfiles -Clink-arg=-nostdlib" cargo \ -Zbuild-std=core,alloc,compiler_builtins \ -Zbuild-std-features=compiler-builtins-mem build \ --target "${TARGET}" \ @@ -104,6 +104,7 @@ RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+crt-static" cargo \ --target-dir "${COOKBOOK_BUILD}" "${GNU_TARGET}-ld" \ -o "${COOKBOOK_BUILD}/bootstrap" \ + -nostdlib \ --gc-sections \ -T "${COOKBOOK_SOURCE}/bootstrap/src/${ARCH}.ld" \ -z max-page-size=4096 \