Merge branch 'split_fbbootlogd' into 'master'

Split fbbootlogd

See merge request redox-os/cookbook!431
This commit is contained in:
Jeremy Soller 2024-12-24 21:31:27 +00:00
commit 0286b839f5
4 changed files with 11 additions and 7 deletions

View File

@ -6,6 +6,7 @@ template = "custom"
script = """
BINS=(
acpid
fbbootlogd
fbcond
inputd
lived
@ -61,7 +62,7 @@ export CARGO_PROFILE_RELEASE_PANIC=abort
for bin in "${BINS[@]}"
do
case "${bin}" in
pcid | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
pcid | fbbootlogd | fbcond | inputd | vesad | lived | ps2d | acpid | bcm2835-sdhcid)
cp -v "target/${TARGET}/release/${bin}" "${COOKBOOK_STAGE}/bin"
;;
*)

View File

@ -7,8 +7,9 @@ inputd
vesad G G G
unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
#TODO: unset FRAMEBUFFER1 and beyond?
fbcond 1 2
logd /scheme/debug /scheme/fbcon/1
fbbootlogd
fbcond 2
logd /scheme/debug /scheme/fbbootlog
stdio /scheme/log
ramfs logging
acpid

View File

@ -7,8 +7,9 @@ inputd
vesad G G G
unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
#TODO: unset FRAMEBUFFER1 and beyond?
fbcond 1 2
logd /scheme/debug /scheme/fbcon/1
fbbootlogd
fbcond 2
logd /scheme/debug /scheme/fbbootlog
stdio /scheme/log
ramfs logging
lived

View File

@ -7,8 +7,9 @@ inputd
vesad G G G
unset FRAMEBUFFER_ADDR FRAMEBUFFER_VIRT FRAMEBUFFER_WIDTH FRAMEBUFFER_HEIGHT FRAMEBUFFER_STRIDE
#TODO: unset FRAMEBUFFER1 and beyond?
fbcond 1 2
logd /scheme/debug /scheme/fbcon/1
fbbootlogd
fbcond 2
logd /scheme/debug /scheme/fbbootlog
stdio /scheme/log
ramfs logging
ps2d us