vasilito
b9de373b31
Restore all bootprocess branch files that were overwritten by later 0.2.0 commits. This overlay brings back the complete boot infrastructure: - Configs: redbear-full, redbear-mini, redbear-device-services, driver .d files - Kernel: IRQ affinity, x2APIC, C-states, NUMA (SLIT/SRAT), MCS locks, cpuidle - Base patches: P0-P55 + new P6 (lived block_size=512) + P57 (fbbootlogd graceful init) - Driver infra: driver-manager, udev-shim, thermald, cpufreqd, iommu, redox-driver-sys/core - GPU: redox-drm with improved connector handling - System: redbear-info, redbear-hwutils phase-timer-check - Build system: fetch.rs improvements, build-iso.sh, run_full.sh - Kernel source: new ACPI (SLIT, SRAT), cpuidle, cstate, MCS lock modules 83 files changed, +3966/-1248 lines
294 lines
10 KiB
TOML
294 lines
10 KiB
TOML
[source]
|
|
git = "https://gitlab.redox-os.org/redox-os/base.git"
|
|
rev = "463f76b9608a896e6f6c9f63457f57f6409873c7"
|
|
patches = [
|
|
"P0-daemon-fix-init-notify-unwrap.patch",
|
|
"P0-workspace-add-bootstrap.patch",
|
|
"P0-init-continuous-scheduling.patch",
|
|
"P0-dhcpd-auto-iface.patch",
|
|
"P0-procmgr-sigchld-debug.patch",
|
|
"P0-pcid-mcfg-diagnostics.patch",
|
|
"P0-ihdgd-intel-gpu-ids.patch",
|
|
"P0-acpid-dmar-fix.patch",
|
|
# P1: acpid EC runtime and AML physmem hardening (narrow ACPI runtime patches)
|
|
"P1-acpid-ec-runtime.patch",
|
|
"P1-acpid-runtime-hardening.patch",
|
|
# Stale patches needing recreation: P1-pcid-uevent-surface, P2-boot-runtime-fixes,
|
|
# P2-hwd-misc, P2-pcid-cfg-access, P3-xhci-device-hardening, P6-cpufreqd-real-impl
|
|
"P2-i2c-gpio-ucsi-drivers.patch",
|
|
"P0-i2c-control-response-empty.patch",
|
|
"P2-ihdad-graceful-init.patch",
|
|
"P2-boot-logging.patch",
|
|
"P2-init-acpid-wiring.patch",
|
|
"P2-hwd-remove-acpid-spawn.patch",
|
|
"P2-initfs-pcid-service.patch",
|
|
"P2-misc-daemon-fixes.patch",
|
|
"P9-fix-so-pecred.patch",
|
|
"P3-inputd-keymap-bridge.patch",
|
|
# P3: ps2d consolidated — LED feedback, mouse resend, fastfail, Intellimouse2, controller init robustness, non-x86 fallback
|
|
"P7-ps2d-intellimouse2-leds-controller-init.patch",
|
|
"P3-usbhidd-hardening.patch",
|
|
"P3-init-colored-output.patch",
|
|
"P4-logd-persistent-logging.patch",
|
|
"P4-acpi-shutdown-hardening.patch",
|
|
"P4-acpi-s3-sleep.patch",
|
|
"P4-pcid-public-client-channel.patch",
|
|
"P4-pcid-config-scheme.patch",
|
|
"P4-pcid-spawner-pci-coordinate-env.patch",
|
|
"P4-initfs-usb-drm-services.patch",
|
|
"P4-initfs-release-virtio-gpu.patch",
|
|
"P4-initfs-network-services.patch",
|
|
"P4-initfs-getty-services.patch",
|
|
"P4-initfs-dbus-services.patch",
|
|
"P4-fbcond-scrollback.patch",
|
|
"P4-ucsid-estale-graceful.patch",
|
|
"P4-acpi-estale-graceful.patch",
|
|
"P4-hwd-estale-graceful.patch",
|
|
# P5-i2c-hidd-estale-retry: REDUNDANT — ESTALE retry already provided by P2 + P4-acpi-estale
|
|
"P5-acpid-dmi-endpoint.patch",
|
|
"P4-thermal-daemon.patch",
|
|
"P4-thermald-workspace.patch",
|
|
"P6-driver-main-fixes.patch",
|
|
"P6-driver-new-modules.patch",
|
|
"P9-init-scheduler-completed.patch",
|
|
"P6-init-requires-hard-dep.patch",
|
|
"P2-pcid-acpid-graceful-fd.patch",
|
|
"P5-fbbootlogd-fbcond-graceful-drm.patch",
|
|
"P7-acpid-shared-pcifd.patch",
|
|
"P6-rtcd-no-ocreat.patch",
|
|
"P6-pcid-acpid-fd-transfer.patch",
|
|
"P15-7-init-service-timeout.patch",
|
|
# P15-8-init-cycle-detection: REDUNDANT — cycle detection already included in P6-init-requires-hard-dep
|
|
"P18-1-daemon-restart.patch",
|
|
"P18-3-msi-msix-enablement.patch",
|
|
"P18-5-acpid-robustness.patch",
|
|
"P18-8-bounded-ipcd-queues.patch",
|
|
"P18-9-msi-allocation-resilience.patch",
|
|
"P19-init-startup-hardening.patch",
|
|
"P19-acpid-startup-hardening.patch",
|
|
"P20-ramfs-requires-randd.patch",
|
|
"P21-boot-daemon-graceful-panic.patch",
|
|
"P23-rootfs-hard-dep-on-drivers.patch",
|
|
"P24-acpi-s5-derivation-shutdown-semantics.patch",
|
|
"P25-fbcond-vesa-fallback.patch",
|
|
"P26-driver-manager-initfs-conversion.patch",
|
|
"P27-fbcond-borrow-fix.patch",
|
|
"P28-init-skip-unmet-conditions.patch",
|
|
"P30-acpid-graceful-scheme-exists.patch",
|
|
"P31-xhcid-restore-interrupts.patch",
|
|
"P32-acpid-graceful-boot.patch",
|
|
"P33-vesad-graceful-boot.patch",
|
|
"P34-fbcond-fbbootlogd-env.patch",
|
|
"P35-fbcond-fbbootlogd-init.patch",
|
|
"P36-graphics-scheme-graceful-init.patch",
|
|
"P37-smolnetd-ready-after-init.patch",
|
|
"P38-vesad-eventqueue-deadlock.patch",
|
|
"P39-pci-allocate-interrupt-vector-graceful.patch",
|
|
"P40-bar-rs-graceful.patch",
|
|
"P41-common-init-graceful.patch",
|
|
"P42-inputd-graceful-fallback.patch",
|
|
"P43-dhcpd-requires-hard-dep.patch",
|
|
"P44-acpid-thermal-zones.patch",
|
|
# P54: Add missing thermal.rs module for P44
|
|
"P54-acpid-thermal-module.patch",
|
|
# P45: Migrate e1000d and ixgbed to MSI-X via pci_allocate_interrupt_vector
|
|
"P45-net-msix-adoption.patch",
|
|
# P46: Migrate ahcid and ac97d to MSI-X via pci_allocate_interrupt_vector
|
|
"P46-storage-audio-msix.patch",
|
|
# P46b: Fix ac97d mutable borrow of pcid_handle (required by pci_allocate_interrupt_vector)
|
|
"P46b-ac97d-mutable-fix.patch",
|
|
# P47: Update thermald to read from P44 thermal zones and coretempd
|
|
"P47-thermald-backend.patch",
|
|
# P48: Add ACPI fan device discovery and status exposure
|
|
"P48-acpid-fan-support.patch",
|
|
# P49: Add IRQ affinity logging and CPU tracking to pcid
|
|
"P49-irq-affinity-logging.patch",
|
|
# P50: Add structured logging rate limiter and thermald integration
|
|
"P50-structured-logging.patch",
|
|
# P51: Add per-service log files and size-based rotation to logd
|
|
"P51-logd-rotation.patch",
|
|
# P52: Add ACPI C-state discovery and thermal-based C-state policy
|
|
"P52-acpid-cstates.patch",
|
|
# P53: Add e1000d interrupt throttling rate (ITR) coalescing
|
|
"P53-e1000d-itr-coalescing.patch",
|
|
# P55: Add JSON structured log format option to logd
|
|
"P55-logd-json-format.patch",
|
|
]
|
|
|
|
[package]
|
|
installs = [
|
|
"/lib/pcid.d/ac97d.toml",
|
|
"/lib/pcid.d/e1000d.toml",
|
|
"/lib/pcid.d/ihdad.toml",
|
|
"/lib/pcid.d/ihdgd.toml",
|
|
"/lib/pcid.d/ixgbed.toml",
|
|
"/lib/pcid.d/rtl8139d.toml",
|
|
"/lib/pcid.d/rtl8168d.toml",
|
|
"/lib/pcid.d/vboxd.toml",
|
|
"/lib/pcid.d/virtio-netd.toml",
|
|
"/lib/pcid.d/xhcid.toml",
|
|
"/usr/bin/audiod",
|
|
"/usr/bin/dhcpd",
|
|
"/usr/bin/dw-acpi-i2cd",
|
|
"/usr/bin/gpiod",
|
|
"/usr/bin/i2cd",
|
|
"/usr/bin/i2c-gpio-expanderd",
|
|
"/usr/bin/i2c-hidd",
|
|
"/usr/bin/inputd",
|
|
"/usr/bin/intel-gpiod",
|
|
"/usr/bin/ipcd",
|
|
"/usr/bin/netstack",
|
|
"/usr/bin/pcid",
|
|
"/usr/bin/pcid-spawner",
|
|
"/usr/bin/ptyd",
|
|
"/usr/bin/redoxerd",
|
|
"/usr/bin/smolnetd",
|
|
"/usr/bin/ucsid",
|
|
"/usr/lib/drivers/ac97d",
|
|
"/usr/lib/drivers/ahcid",
|
|
"/usr/lib/drivers/amd-mp2-i2cd",
|
|
"/usr/lib/drivers/e1000d",
|
|
"/usr/lib/drivers/ihdad",
|
|
"/usr/lib/drivers/ihdgd",
|
|
"/usr/lib/drivers/ided",
|
|
"/usr/lib/drivers/intel-lpss-i2cd",
|
|
"/usr/lib/drivers/intel-thc-hidd",
|
|
"/usr/lib/drivers/ixgbed",
|
|
"/usr/lib/drivers/ps2d",
|
|
"/usr/lib/drivers/rtl8139d",
|
|
"/usr/lib/drivers/rtl8168d",
|
|
"/usr/lib/drivers/sb16d",
|
|
"/usr/lib/drivers/thermald",
|
|
"/usr/lib/drivers/usbctl",
|
|
"/usr/lib/drivers/usbhidd",
|
|
"/usr/lib/drivers/usbhubd",
|
|
"/usr/lib/drivers/usbscsid",
|
|
"/usr/lib/drivers/vboxd",
|
|
"/usr/lib/drivers/virtio-gpud",
|
|
"/usr/lib/drivers/virtio-netd",
|
|
"/usr/lib/drivers/xhcid",
|
|
"/usr/lib/init.d/00_base.target",
|
|
"/usr/lib/init.d/00_ipcd.service",
|
|
"/usr/lib/init.d/00_pcid-spawner.service",
|
|
"/usr/lib/init.d/00_ptyd.service",
|
|
"/usr/lib/init.d/00_sudo.service",
|
|
"/usr/lib/init.d/00_tmp",
|
|
"/usr/lib/init.d/05_boot_essential.target",
|
|
"/usr/lib/init.d/10_dhcpd.service",
|
|
"/usr/lib/init.d/10_net.target",
|
|
"/usr/lib/init.d/10_smolnetd.service",
|
|
"/usr/lib/init.d/12_boot_late.target",
|
|
"/usr/lib/init.d/12_dbus.service",
|
|
"/usr/lib/init.d/13_seatd.service",
|
|
"/usr/lib/init.d/13_sessiond.service",
|
|
"/usr/lib/init.d/20_audiod.service",
|
|
"/usr/lib/init.d/29_activate_console.service",
|
|
"/usr/lib/init.d/30_console.service",
|
|
"/usr/lib/init.d/30_thermald.service",
|
|
"/usr/lib/init.d/31_debug_console.service",
|
|
]
|
|
|
|
[build]
|
|
template = "custom"
|
|
script = """
|
|
mkdir -pv "${COOKBOOK_STAGE}/usr/bin"
|
|
for package in audiod ipcd ptyd dhcpd; do
|
|
"${COOKBOOK_CARGO}" build \
|
|
--manifest-path "${COOKBOOK_SOURCE}/${package}/Cargo.toml" \
|
|
--target "${TARGET}" \
|
|
${build_flags}
|
|
cp -v \
|
|
"target/${TARGET}/${build_type}/${package}" \
|
|
"${COOKBOOK_STAGE}/usr/bin/${package}"
|
|
done
|
|
|
|
"${COOKBOOK_CARGO}" build \
|
|
--manifest-path "${COOKBOOK_SOURCE}/netstack/Cargo.toml" \
|
|
--target "${TARGET}" \
|
|
${build_flags}
|
|
cp -v \
|
|
"target/${TARGET}/${build_type}/netstack" \
|
|
"${COOKBOOK_STAGE}/usr/bin/netstack"
|
|
cp -v \
|
|
"target/${TARGET}/${build_type}/netstack" \
|
|
"${COOKBOOK_STAGE}/usr/bin/smolnetd"
|
|
|
|
# Drivers that are built on all architectures, and NOT in drivers-initfs
|
|
BINS=(
|
|
gpiod
|
|
i2c-gpio-expanderd
|
|
intel-gpiod
|
|
amd-mp2-i2cd
|
|
dw-acpi-i2cd
|
|
e1000d
|
|
ihdad
|
|
ihdgd
|
|
i2c-hidd
|
|
intel-thc-hidd
|
|
intel-lpss-i2cd
|
|
ixgbed
|
|
pcid
|
|
pcid-spawner
|
|
acpid
|
|
redoxerd
|
|
rtl8139d
|
|
rtl8168d
|
|
usbctl
|
|
usbhidd
|
|
thermald
|
|
usbhubd
|
|
ucsid
|
|
usbscsid
|
|
virtio-gpud
|
|
virtio-netd
|
|
xhcid
|
|
i2cd
|
|
inputd
|
|
)
|
|
|
|
# Add additional drivers to the list to build, that are not in drivers-initfs
|
|
# depending on the target architecture
|
|
case "${TARGET}" in
|
|
i586-unknown-redox | i686-unknown-redox | x86_64-unknown-redox)
|
|
BINS+=(ac97d ahcid ided nvmed ps2d sb16d vboxd)
|
|
;;
|
|
*)
|
|
;;
|
|
esac
|
|
|
|
#Build each driver in the list
|
|
mkdir -pv "${COOKBOOK_STAGE}/usr/bin" "${COOKBOOK_STAGE}/usr/lib/drivers"
|
|
export CARGO_PROFILE_RELEASE_OPT_LEVEL=s
|
|
export CARGO_PROFILE_RELEASE_PANIC=abort
|
|
# Only build drivers that actually have source Cargo.toml entries
|
|
EXISTING_BINS=()
|
|
for bin in "${BINS[@]}"
|
|
do
|
|
if grep -Rqs "^name = \\\"${bin}\\\"$" "${COOKBOOK_SOURCE}"; then
|
|
EXISTING_BINS+=("${bin}")
|
|
fi
|
|
done
|
|
"${COOKBOOK_CARGO}" build ${build_flags} \
|
|
--manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
|
|
--target "${TARGET}" \
|
|
$(for bin in "${EXISTING_BINS[@]}"; do echo "-p" "${bin}"; done)
|
|
for bin in "${EXISTING_BINS[@]}"
|
|
do
|
|
if [[ "${bin}" == "gpiod" || "${bin}" == "i2c-gpio-expanderd" || "${bin}" == "intel-gpiod" || "${bin}" == "i2cd" || "${bin}" == "dw-acpi-i2cd" || "${bin}" == "acpid" || "${bin}" == "thermald" || "${bin}" == "i2c-hidd" || "${bin}" == "inputd" || "${bin}" == "pcid" || "${bin}" == "pcid-spawner" || "${bin}" == "redoxerd" || "${bin}" == "ucsid" ]]; then
|
|
cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_STAGE}/usr/bin"
|
|
else
|
|
cp -v "target/${TARGET}/${build_type}/${bin}" "${COOKBOOK_STAGE}/usr/lib/drivers"
|
|
fi
|
|
done
|
|
|
|
mkdir -pv "${COOKBOOK_STAGE}/lib/pcid.d"
|
|
find "${COOKBOOK_SOURCE}/drivers" -maxdepth 3 -type f -name 'config.toml' | while read conf
|
|
do
|
|
driver="$(basename "$(dirname "$conf")")"
|
|
cp -v "$conf" "${COOKBOOK_STAGE}/lib/pcid.d/$driver.toml"
|
|
done
|
|
|
|
mkdir -pv "${COOKBOOK_STAGE}/usr/lib/init.d"
|
|
cp -v "${COOKBOOK_SOURCE}/init.d"/* "${COOKBOOK_STAGE}/usr/lib/init.d/"
|
|
"""
|