config: complete pcid-spawner retirement
- base-initfs recipe: pcid-spawner removed from initfs BINS and the
lib/pcid.d initfs staging dropped (dead pcid-spawner config).
- acid.toml, redoxer.toml: requires_weak now points at
00_driver-manager.service.
- redbear-mini.toml: dead /etc/pcid.d/* staging removed; driver-manager
service override no longer gated on the retired fallback flag.
- redbear-full.toml: dead legacy-format /etc/pcid.d/ihdgd.toml and
virtio-gpud.toml removed (driver-manager's 30-graphics.toml covers
the same drivers in the current format).
- Comments updated: no fallback exists; driver-manager owns the path
unconditionally. Base submodule bump (0c11c2b5).
This commit is contained in:
+1
-1
@@ -18,7 +18,7 @@ path = "/usr/lib/init.d/10_acid.service"
|
||||
data = """
|
||||
[unit]
|
||||
description = "Acid test runner"
|
||||
requires_weak = ["00_pcid-spawner.service"]
|
||||
requires_weak = ["00_driver-manager.service"]
|
||||
|
||||
[service]
|
||||
cmd = "ion"
|
||||
|
||||
@@ -8,8 +8,8 @@ pciids = {}
|
||||
fatd = {}
|
||||
driver-manager = {}
|
||||
# driver-manager owns the boot-time PCI match/claim/spawn path since the
|
||||
# cutover. pcid-spawner stays built into base and staged, gated behind
|
||||
# /etc/driver-manager.d/disabled as the operator fallback.
|
||||
# cutover. pcid-spawner is retired and removed; driver-manager owns the
|
||||
# boot path unconditionally.
|
||||
|
||||
# Firmware fallback chain configs
|
||||
[[files]]
|
||||
@@ -650,8 +650,8 @@ subclass = 0x80
|
||||
"""
|
||||
|
||||
# PCI driver spawning is performed by driver-manager since the cutover
|
||||
# (00_driver-manager.service, oneshot_async, --hotplug). pcid-spawner
|
||||
# stays staged as the fallback behind /etc/driver-manager.d/disabled.
|
||||
# (00_driver-manager.service, oneshot_async, --hotplug). pcid-spawner is
|
||||
# retired and removed.
|
||||
# Firmware fallback chain configs
|
||||
[[files]]
|
||||
path = "/etc/firmware-fallbacks.d/00-amdgpu.toml"
|
||||
@@ -704,10 +704,10 @@ chain = ["i915/adlp_dmc_ver2_14.bin", "i915/adlp_dmc_ver2_12.bin"]
|
||||
|
||||
# There must be exactly one PCI driver spawner service active in the image:
|
||||
# since the cutover that is 00_driver-manager.service (oneshot_async).
|
||||
# pcid-spawner remains staged behind /etc/driver-manager.d/disabled as the
|
||||
# operator fallback. Do not add a second, differently-named service that
|
||||
# also spawns PCI drivers — two async instances race to spawn the same
|
||||
# drivers.
|
||||
# pcid-spawner is retired and removed; driver-manager is the only PCI
|
||||
# driver spawner in the image. Do not add a second, differently-named
|
||||
# service that also spawns PCI drivers — two async instances race to spawn
|
||||
# the same drivers.
|
||||
|
||||
# Firmware fallback chain configs
|
||||
[[files]]
|
||||
|
||||
@@ -632,35 +632,6 @@ class = 0x03
|
||||
subclass = 0x00
|
||||
"""
|
||||
|
||||
[[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"
|
||||
data = """
|
||||
|
||||
@@ -28,8 +28,7 @@ redbear-hwutils = {}
|
||||
redbear-quirks = {}
|
||||
|
||||
# Device driver infrastructure (driver-manager owns the boot-time PCI
|
||||
# match/claim/spawn path since the cutover; pcid-spawner stays staged as
|
||||
# the fallback behind /etc/driver-manager.d/disabled)
|
||||
# match/claim/spawn path; pcid-spawner is retired and removed)
|
||||
ehcid = {}
|
||||
ohcid = {}
|
||||
uhcid = {}
|
||||
@@ -497,28 +496,6 @@ data = ""
|
||||
directory = true
|
||||
mode = 0o755
|
||||
|
||||
[[files]]
|
||||
path = "/etc/pcid.d/ihdgd.toml"
|
||||
data = """
|
||||
# redbear-live-mini: text-only image; override upstream ihdgd config with empty file
|
||||
"""
|
||||
|
||||
[[files]]
|
||||
path = "/etc/pcid.d/virtio-gpud.toml"
|
||||
data = """
|
||||
# redbear-live-mini: text-only image; override upstream virtio-gpud config with empty file
|
||||
"""
|
||||
|
||||
[[files]]
|
||||
path = "/etc/pcid.d/00_text_mode_gpu_mask.toml"
|
||||
data = """
|
||||
# redbear-live-mini: no display driver matched; class 0x03 devices are skipped
|
||||
"""
|
||||
|
||||
# INIT_SKIP removed — all daemons are now enabled for boot.
|
||||
# Individual hardware daemons that fail in QEMU will exit cleanly
|
||||
# rather than blocking boot via the oneshot_async service type.
|
||||
|
||||
[[files]]
|
||||
path = "/etc/init.d/29_activate_console.service"
|
||||
data = """
|
||||
@@ -582,7 +559,6 @@ description = "Driver manager (non-blocking on live-mini)"
|
||||
cmd = "driver-manager"
|
||||
args = ["--hotplug"]
|
||||
type = "oneshot_async"
|
||||
ConditionPathExists = "!/etc/driver-manager.d/disabled"
|
||||
"""
|
||||
|
||||
[[files]]
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ path = "/usr/lib/init.d/10_smolnetd.service"
|
||||
data = """
|
||||
[unit]
|
||||
description = "Network stack for redoxer"
|
||||
requires_weak = ["00_pcid-spawner.service"]
|
||||
requires_weak = ["00_driver-manager.service"]
|
||||
|
||||
[service]
|
||||
cmd = "netstack"
|
||||
|
||||
+1
-1
Submodule local/sources/base updated: 62e7651fe7...0c11c2b515
@@ -33,7 +33,6 @@ BINS=(
|
||||
lived
|
||||
nvmed
|
||||
pcid
|
||||
pcid-spawner
|
||||
rtcd
|
||||
vesad
|
||||
)
|
||||
@@ -108,8 +107,6 @@ cp "${COOKBOOK_SOURCE}/init.initfs.d"/* "${COOKBOOK_BUILD}/initfs/lib/init.d/"
|
||||
|
||||
mkdir -pv "${COOKBOOK_BUILD}/initfs/lib/drivers.d"
|
||||
cp -v "${COOKBOOK_SOURCE}/drivers/initfs-storage.toml" "${COOKBOOK_BUILD}/initfs/lib/drivers.d/00-storage.toml"
|
||||
mkdir -pv "${COOKBOOK_BUILD}/initfs/lib/pcid.d"
|
||||
cp -v "${COOKBOOK_SOURCE}/drivers/initfs-pcid-storage.toml" "${COOKBOOK_BUILD}/initfs/lib/pcid.d/00-storage.toml"
|
||||
|
||||
export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
|
||||
export CARGO_PROFILE_RELEASE_PANIC=abort
|
||||
@@ -122,7 +119,7 @@ mkdir -pv "${COOKBOOK_BUILD}/initfs/bin" "${COOKBOOK_BUILD}/initfs/lib/drivers"
|
||||
for bin in "${BINS[@]}"
|
||||
do
|
||||
case "${bin}" in
|
||||
init | logd | ramfs | randd | zerod | pcid | pcid-spawner | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid | rtcd | hwd | ptyd | getty)
|
||||
init | logd | ramfs | randd | zerod | pcid | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid | rtcd | hwd | ptyd | getty)
|
||||
cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_BUILD}/initfs/bin"
|
||||
;;
|
||||
*)
|
||||
|
||||
Reference in New Issue
Block a user