diff --git a/config/redbear-full.toml b/config/redbear-full.toml index b8e3a16e20..77035f90c8 100644 --- a/config/redbear-full.toml +++ b/config/redbear-full.toml @@ -237,7 +237,7 @@ data = """ [unit] description = "Boot essential services target" requires_weak = [ - "04_drivers.target", + "00_base.target", ] """ @@ -261,7 +261,7 @@ data = """ [unit] description = "DRM/KMS display driver (AMD + Intel + VirtIO)" requires_weak = [ - "04_drivers.target", + "05_boot-essential.target", ] [service] @@ -276,7 +276,7 @@ data = """ [unit] description = "D-Bus system bus" requires_weak = [ - "06_services.target", + "12_boot-late.target", "00_ipcd.service", ] @@ -292,7 +292,6 @@ data = """ [unit] description = "Red Bear session broker (org.freedesktop.login1)" requires_weak = [ - "06_services.target", "12_dbus.service", ] @@ -307,7 +306,6 @@ data = """ [unit] description = "seatd seat management daemon" requires_weak = [ - "06_services.target", "12_dbus.service", "13_redbear-sessiond.service", ] @@ -427,7 +425,6 @@ data = """ [unit] description = "Red Bear greeter service" requires_weak = [ - "08_userland.target", "00_driver-manager.service", "14_redox-drm.service", "12_dbus.service", @@ -447,9 +444,8 @@ path = "/etc/init.d/29_activate_console.service" data = """ [unit] description = "Activate fallback console VT" -default_dependencies = false requires_weak = [ - "00_base.target", + "05_boot-essential.target", ] [service] @@ -463,7 +459,6 @@ path = "/etc/init.d/30_console.service" data = """ [unit] description = "Console terminals" -default_dependencies = false requires_weak = [ "29_activate_console.service", ] @@ -479,7 +474,6 @@ path = "/etc/init.d/31_debug_console.service" data = """ [unit] description = "Debug console on serial port" -default_dependencies = false requires_weak = [ "29_activate_console.service", ] @@ -523,6 +517,34 @@ members = ["greeter"] gid = 100 members = ["messagebus"] +[[files]] +path = "/etc/pcid.d/ihdgd.toml" +data = """ +[[drivers]] +name = "Intel GPU (VGA compatible)" +class = 0x03 +vendor = 0x8086 +subclass = 0x00 +command = ["redox-drm"] + +[[drivers]] +name = "Intel GPU (3D controller)" +class = 0x03 +vendor = 0x8086 +subclass = 0x02 +command = ["redox-drm"] +""" + +[[files]] +path = "/etc/pcid.d/virtio-gpud.toml" +data = """ +[[drivers]] +name = "VirtIO GPU" +class = 0x03 +vendor = 0x1af4 +device = 0x1050 +command = ["/usr/bin/redox-drm"] +""" [[files]] path = "/etc/environment.d/90-dbus.conf" diff --git a/local/recipes/kde/kf6-extra-cmake-modules/recipe.toml b/local/recipes/kde/kf6-extra-cmake-modules/recipe.toml index 8d93d17737..5d84edf137 100644 --- a/local/recipes/kde/kf6-extra-cmake-modules/recipe.toml +++ b/local/recipes/kde/kf6-extra-cmake-modules/recipe.toml @@ -19,7 +19,6 @@ cmake "${COOKBOOK_SOURCE}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" \ -DBUILD_TESTING=OFF \ - -DBUILD_DOC=OFF \ -DBUILD_QCH=OFF \ -Wno-dev