remove all status checks. only handle release.
the release variable is all we need, turning a target on or off for a given release. the status checks were prone to bugs, and unnecessary; it also broke certain benchmark scripts. it's better to keep the cbmk logic simpler. board status will be moved to the documentation instead. Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
parent
4826364afb
commit
d423421995
1
build
1
build
|
|
@ -119,7 +119,6 @@ usage()
|
|||
mkrelease()
|
||||
{
|
||||
export CBMK_RELEASE="y"
|
||||
export CBMK_STATUS="n"
|
||||
|
||||
vdir="release"
|
||||
while getopts d:m: option; do
|
||||
|
|
|
|||
|
|
@ -4,5 +4,4 @@ payload_grub="n"
|
|||
payload_grub_withseabios="n"
|
||||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
status="untested"
|
||||
release="n"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
this board has never been stable, and has not been tested in Libreboot 20240504 so no ROM images included for it in that release
|
||||
|
|
@ -3,5 +3,4 @@ xarch="i386-elf"
|
|||
payload_seabios="y"
|
||||
payload_seabios_withgrub="y"
|
||||
payload_memtest="y"
|
||||
status="untested"
|
||||
release="n"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
this board has never been stable, and has not been tested in Libreboot 20240504 so no ROM images included for it in that release
|
||||
|
|
@ -4,5 +4,4 @@ payload_grub="n"
|
|||
payload_grub_withseabios="n"
|
||||
payload_seabios="y"
|
||||
payload_memtest="n"
|
||||
status="untested"
|
||||
release="n"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
this board has never been stable, and has not been tested in Libreboot 20240504 so no ROM images included for it in that release
|
||||
|
|
@ -4,5 +4,4 @@ payload_grub="n"
|
|||
payload_grub_withseabios="n"
|
||||
payload_seabios="y"
|
||||
payload_memtest="n"
|
||||
status="untested"
|
||||
release="n"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
this board has never been stable, and has not been tested in Libreboot 20240504 so no ROM images included for it in that release
|
||||
|
|
@ -7,4 +7,3 @@ payload_memtest="y"
|
|||
payload_seabios_withgrub="y"
|
||||
payload_seabios_grubonly="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable" # broken s3
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Battery indicator not working yet. May shut down instead of throttle on high CPU temperature; use the intel_pstate driver to cap speeds, and monitor performance via CPU stress test and lm-sensors/xsensors utility, before using the machine regularly.
|
||||
|
|
@ -3,4 +3,3 @@ xarch="i386-elf"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_timeout=10
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -3,5 +3,4 @@ xarch="i386-elf"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_timeout=10
|
||||
status="stable"
|
||||
release="n"
|
||||
|
|
|
|||
|
|
@ -4,4 +4,3 @@ payload_seabios="y"
|
|||
payload_memtest="y"
|
||||
grub_scan_disk="ata"
|
||||
grub_timeout=10
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
tree="default"
|
||||
xarch="aarch64-elf arm-eabi"
|
||||
payload_uboot="y"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Incomplete UEFI implementation but should boot most distros fine. Debian Bookworm installed and the first 1GB or so of the partition got corrupted. Leave the first 2GB or so unpartitioned, when installing any distro.
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
tree="default"
|
||||
xarch="aarch64-elf arm-eabi"
|
||||
payload_uboot="y"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
Incomplete UEFI implementation but should boot most distros fine. Debian Bookworm installed and the first 1GB or so of the partition got corrupted. Leave the first 2GB or so unpartitioned, when installing any distro.
|
||||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
xlang="c"
|
||||
status="unstable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raminit has always been unreliable on this board; ymmv
|
||||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
xlang="c"
|
||||
status="unstable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raminit has always been unreliable on this board; ymmv
|
||||
|
|
@ -6,4 +6,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
xlang="c"
|
||||
status="unstable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raminit has always been unreliable on this board; ymmv
|
||||
|
|
@ -6,4 +6,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
xlang="c"
|
||||
status="unstable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raminit has always been unreliable on this board; ymmv
|
||||
|
|
@ -4,4 +4,3 @@ payload_seabios="y"
|
|||
payload_memtest="y"
|
||||
xlang="c"
|
||||
grub_timeout=10
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_seabios_withgrub="y"
|
|||
payload_memtest="y"
|
||||
xlang="c"
|
||||
grub_timeout=10
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_seabios_withgrub="y"
|
|||
payload_memtest="y"
|
||||
xlang="c"
|
||||
grub_timeout=10
|
||||
status="unstable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raminit has always been unreliable on this board; ymmv
|
||||
|
|
@ -5,4 +5,3 @@ payload_seabios_withgrub="y"
|
|||
payload_memtest="y"
|
||||
xlang="c"
|
||||
grub_timeout=10
|
||||
status="unstable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raminit has always been unreliable on this board; ymmv
|
||||
|
|
@ -6,4 +6,3 @@ payload_seabios_withgrub="y"
|
|||
payload_memtest="y"
|
||||
xlang="c"
|
||||
grub_timeout=10
|
||||
status="unstable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raminit has always been unreliable on this board; ymmv
|
||||
|
|
@ -6,4 +6,3 @@ payload_seabios_withgrub="y"
|
|||
payload_memtest="y"
|
||||
xlang="c"
|
||||
grub_timeout=10
|
||||
status="unstable"
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
raminit has always been unreliable on this board; ymmv
|
||||
|
|
@ -4,4 +4,3 @@ payload_grub="y"
|
|||
payload_grub_withseabios="y"
|
||||
payload_seabios="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -4,4 +4,3 @@ payload_grub="y"
|
|||
payload_grub_withseabios="y"
|
||||
payload_seabios="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
tree="default"
|
||||
xarch="aarch64-elf arm-eabi"
|
||||
payload_uboot="y"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="both"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
grub_scan_disk="ahci"
|
||||
grub_background="background1024x768.png"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
grub_scan_disk="ahci"
|
||||
grub_background="background1024x768.png"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
payload_memtest="y"
|
||||
grub_scan_disk="ahci"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
grub_scan_disk="ahci"
|
||||
grub_background="background1024x768.png"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ payload_grub_withseabios="y"
|
|||
payload_seabios="y"
|
||||
grub_scan_disk="ahci"
|
||||
grub_background="background1024x768.png"
|
||||
status="stable"
|
||||
|
|
|
|||
|
|
@ -33,8 +33,8 @@ setvars()
|
|||
done
|
||||
printf "%s\n" "${_setvars% }"
|
||||
}
|
||||
eval "$(setvars "" _nogit _dest board boarddir cbmk_release cbmk_status threads \
|
||||
version versiondate projectname)"
|
||||
eval "$(setvars "" versiondate tmpdir _nogit version _dest board boarddir \
|
||||
cbmk_release threads projectname)"
|
||||
|
||||
# if "y": a coreboot target won't be built if target.cfg says release="n"
|
||||
# (this is used to exclude certain build targets from releases)
|
||||
|
|
@ -43,13 +43,6 @@ set | grep CBMK_RELEASE 1>/dev/null 2>/dev/null || cbmk_release="n" || :
|
|||
[ "$cbmk_release" = "n" ] || [ "$cbmk_release" = "y" ] || cbmk_release="n"
|
||||
export CBMK_RELEASE="$cbmk_release"
|
||||
|
||||
# if set to n via export, status checks will be skipped during
|
||||
# all builds, and all targets will be built regardless of status.
|
||||
# this replicates the old behaviour of cbmk, prior to the checks.
|
||||
set | grep CBMK_STATUS 1>/dev/null 2>/dev/null && cbmk_status="$CBMK_STATUS"
|
||||
[ "$cbmk_status" = "y" ] || [ "$cbmk_status" = "n" ] || cbmk_status="y"
|
||||
export CBMK_STATUS="$cbmk_status"
|
||||
|
||||
set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
|
||||
if [ "${tmpdir_was_set}" = "y" ]; then
|
||||
[ "${TMPDIR%_*}" = "/tmp/cbmk" ] || tmpdir_was_set="n"
|
||||
|
|
|
|||
88
script/roms
88
script/roms
|
|
@ -24,31 +24,23 @@ stm32_src_dir="src/stm32-vserprog"
|
|||
pv="payload_grub payload_grub_withseabios payload_seabios payload_memtest t"
|
||||
pv="${pv} payload_seabios_withgrub payload_seabios_grubonly payload_uboot memtest_bin"
|
||||
v="romdir cbrom initmode displaymode cbcfg targetdir tree keymaps release"
|
||||
v="${v} grub_timeout ubdir board grub_scan_disk uboot_config status"
|
||||
v="${v} grub_timeout ubdir board grub_scan_disk uboot_config"
|
||||
eval "$(setvars "n" ${pv} serprog)"
|
||||
eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets \
|
||||
skipped listboards list_type serprog_boards_dir)"
|
||||
serprog_boards_dir)"
|
||||
|
||||
main()
|
||||
{
|
||||
check_project
|
||||
|
||||
while [ $# -gt 0 ]; do
|
||||
if [ "$listboards" = "y" ]; then
|
||||
list_type="$list_type $1"
|
||||
list_type="${list_type# }"
|
||||
shift 1; continue
|
||||
fi
|
||||
|
||||
case ${1} in
|
||||
help)
|
||||
usage
|
||||
exit 0 ;;
|
||||
list)
|
||||
boards=$(items config/coreboot) || \
|
||||
$err "Cannot generate list of boards for list"
|
||||
listboards="y"
|
||||
shift 1; continue ;;
|
||||
x_ items config/coreboot
|
||||
return 0 ;;
|
||||
serprog)
|
||||
serprog="y"
|
||||
shift 1; break ;;
|
||||
|
|
@ -74,14 +66,6 @@ main()
|
|||
done
|
||||
fi
|
||||
|
||||
[ "$listboards" = "y" ] && return 0
|
||||
|
||||
if [ -n "$skipped" ]; then
|
||||
printf "\nThese targets were skipped:\n"
|
||||
eval "printf \"${skipped}\""
|
||||
printf "^^ These targets were skipped.\n\n"
|
||||
fi
|
||||
|
||||
[ -z "${targets}" ] && $err "No ROM images were compiled"
|
||||
printf "\nROM images available in these directories:\n"
|
||||
eval "printf \"${targets}\""
|
||||
|
|
@ -155,18 +139,11 @@ handle_coreboot_target()
|
|||
eval "$(setvars "n" ${pv}) $(setvars "" ${v})"
|
||||
grub_background="background1280x800.png"
|
||||
board="$1"
|
||||
status="unknown"
|
||||
|
||||
configure_target
|
||||
[ "$board" = "$tree" ] && \
|
||||
return 0
|
||||
|
||||
print_target_name && return 0
|
||||
|
||||
# exclude certain targets from the release
|
||||
if skip_board; then
|
||||
printf "Skip target %s(%s)\n" "$board" "$status"
|
||||
skipped="* $board($status)\n$skipped"
|
||||
[ "$board" = "$tree" ] && return 0
|
||||
if [ "$cbmk_release" = "y" ] && [ "$release" = "n" ]; then
|
||||
printf "Target '%s' disabled for release.\n" "$board"
|
||||
return 0
|
||||
fi
|
||||
|
||||
|
|
@ -225,57 +202,6 @@ configure_target()
|
|||
eval "payload_${_payload}=y"
|
||||
}
|
||||
|
||||
print_target_name()
|
||||
{
|
||||
[ "$listboards" = "y" ] || return 1
|
||||
|
||||
[ -z "$list_type" ] && printf "%s\n" "$board"
|
||||
|
||||
for _list_type in $list_type; do
|
||||
if [ "${_list_type#_}" = "$_list_type" ]; then
|
||||
[ "$status" != "$_list_type" ] && \
|
||||
continue
|
||||
printf "%s\n" "$board"
|
||||
break
|
||||
elif [ "$status" != "${_list_type#_}" ]; then
|
||||
printf "%s\n" "$board"
|
||||
break
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
skip_board()
|
||||
{
|
||||
if [ "$listboards" != "y" ] && [ "$status" != "stable" ]; then
|
||||
printf "\n\n\t!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
|
||||
printf "\t__WARNING: %s has status '%s'__\n" \
|
||||
"$board" "$status"
|
||||
printf "\t!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n"
|
||||
fi
|
||||
|
||||
if [ -f "$targetdir/warn.txt" ] && [ "$listboards" != "y" ]; then
|
||||
printf "Regarding target '%s' (status '%s'):\n\n" \
|
||||
"$board" "$status"
|
||||
cat -u "$targetdir/warn.txt" || \
|
||||
$err "!cat $targetdir/warn.txt"
|
||||
fi
|
||||
|
||||
[ "$cbmk_release" = "y" ] && [ "$release" = "n" ] && return 0
|
||||
[ "$cbmk_release" = "y" ] && [ "$status" != "broken" ] && return 1
|
||||
[ "$cbmk_status" = "y" ] || return 1
|
||||
[ "$status" = "stable" ] && return 1
|
||||
|
||||
printf "\nTo disable this dialog when building, do:\n"
|
||||
printf "export CBMK_STATUS=n\n\n"
|
||||
while true; do
|
||||
printf "Board %s has status '%s'. Skip? [y/n] " \
|
||||
"$board" "$status"
|
||||
read -r skip
|
||||
[ "$skip" = "y" ] && return 0
|
||||
[ "$skip" = "n" ] && return 1; continue
|
||||
done
|
||||
}
|
||||
|
||||
build_payloads()
|
||||
{
|
||||
romdir="bin/${board}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue