diff options
43 files changed, 68 insertions, 123 deletions
diff --git a/config/coreboot/gru_bob/target.cfg b/config/coreboot/gru_bob/target.cfg index c6ad9102..86283f7a 100644 --- a/config/coreboot/gru_bob/target.cfg +++ b/config/coreboot/gru_bob/target.cfg @@ -1,4 +1,4 @@ tree="default" xarch="aarch64-elf arm-eabi" payload_uboot="y" -status="unstable" +status="stable" diff --git a/config/coreboot/gru_kevin/target.cfg b/config/coreboot/gru_kevin/target.cfg index c6ad9102..86283f7a 100644 --- a/config/coreboot/gru_kevin/target.cfg +++ b/config/coreboot/gru_kevin/target.cfg @@ -1,4 +1,4 @@ tree="default" xarch="aarch64-elf arm-eabi" payload_uboot="y" -status="unstable" +status="stable" diff --git a/config/coreboot/hp2170p_16mb/target.cfg b/config/coreboot/hp2170p_16mb/target.cfg index 1b9e33f0..e6f295cf 100644 --- a/config/coreboot/hp2170p_16mb/target.cfg +++ b/config/coreboot/hp2170p_16mb/target.cfg @@ -6,4 +6,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp2170p_16mb/warn.txt b/config/coreboot/hp2170p_16mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp2170p_16mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp2560p_8mb/target.cfg b/config/coreboot/hp2560p_8mb/target.cfg index 1b9e33f0..e6f295cf 100644 --- a/config/coreboot/hp2560p_8mb/target.cfg +++ b/config/coreboot/hp2560p_8mb/target.cfg @@ -6,4 +6,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp2560p_8mb/warn.txt b/config/coreboot/hp2560p_8mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp2560p_8mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp2570p_16mb/target.cfg b/config/coreboot/hp2570p_16mb/target.cfg index 1b9e33f0..e6f295cf 100644 --- a/config/coreboot/hp2570p_16mb/target.cfg +++ b/config/coreboot/hp2570p_16mb/target.cfg @@ -6,4 +6,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp2570p_16mb/warn.txt b/config/coreboot/hp2570p_16mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp2570p_16mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg index 12afcd76..01583d37 100644 --- a/config/coreboot/hp8200sff_4mb/target.cfg +++ b/config/coreboot/hp8200sff_4mb/target.cfg @@ -5,4 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp8200sff_4mb/warn.txt b/config/coreboot/hp8200sff_4mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp8200sff_4mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg index 12afcd76..01583d37 100644 --- a/config/coreboot/hp8200sff_8mb/target.cfg +++ b/config/coreboot/hp8200sff_8mb/target.cfg @@ -5,4 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp8200sff_8mb/warn.txt b/config/coreboot/hp8200sff_8mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp8200sff_8mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp820g2_12mb/warn.txt b/config/coreboot/hp820g2_12mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp820g2_12mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp8300cmt_16mb/target.cfg b/config/coreboot/hp8300cmt_16mb/target.cfg index 12afcd76..01583d37 100644 --- a/config/coreboot/hp8300cmt_16mb/target.cfg +++ b/config/coreboot/hp8300cmt_16mb/target.cfg @@ -5,4 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp8300cmt_16mb/warn.txt b/config/coreboot/hp8300cmt_16mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp8300cmt_16mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp8300usdt_16mb/target.cfg b/config/coreboot/hp8300usdt_16mb/target.cfg index 12afcd76..01583d37 100644 --- a/config/coreboot/hp8300usdt_16mb/target.cfg +++ b/config/coreboot/hp8300usdt_16mb/target.cfg @@ -5,4 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp8300usdt_16mb/warn.txt b/config/coreboot/hp8300usdt_16mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp8300usdt_16mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp8460pintel_8mb/target.cfg b/config/coreboot/hp8460pintel_8mb/target.cfg index 1b9e33f0..e6f295cf 100644 --- a/config/coreboot/hp8460pintel_8mb/target.cfg +++ b/config/coreboot/hp8460pintel_8mb/target.cfg @@ -6,4 +6,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp8460pintel_8mb/warn.txt b/config/coreboot/hp8460pintel_8mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp8460pintel_8mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp8470pintel_16mb/target.cfg b/config/coreboot/hp8470pintel_16mb/target.cfg index 1b9e33f0..e6f295cf 100644 --- a/config/coreboot/hp8470pintel_16mb/target.cfg +++ b/config/coreboot/hp8470pintel_16mb/target.cfg @@ -6,4 +6,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp8470pintel_16mb/warn.txt b/config/coreboot/hp8470pintel_16mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp8470pintel_16mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp8560w_8mb/warn.txt b/config/coreboot/hp8560w_8mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp8560w_8mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/hp9470m_16mb/target.cfg b/config/coreboot/hp9470m_16mb/target.cfg index 1b9e33f0..e6f295cf 100644 --- a/config/coreboot/hp9470m_16mb/target.cfg +++ b/config/coreboot/hp9470m_16mb/target.cfg @@ -6,4 +6,4 @@ payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" grub_timeout=10 -status="untested" +status="unstable" diff --git a/config/coreboot/hp9470m_16mb/warn.txt b/config/coreboot/hp9470m_16mb/warn.txt new file mode 100644 index 00000000..68f0b1fe --- /dev/null +++ b/config/coreboot/hp9470m_16mb/warn.txt @@ -0,0 +1 @@ +HP EliteBook 8560w has broken wifi. See issue https://codeberg.org/libreboot/lbmk/issues/201 - may affect other HP machines so setting them as unstable. The machines should otherwise boot reliably and you can use them - if wifi doesn't work, you can use a usb wifi dongle or, on HP desktops, use an add-on wifi card. diff --git a/config/coreboot/macbook11/target.cfg b/config/coreboot/macbook11/target.cfg index 3c06a458..38046653 100644 --- a/config/coreboot/macbook11/target.cfg +++ b/config/coreboot/macbook11/target.cfg @@ -4,4 +4,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" -status="unstable" +status="stable" diff --git a/config/coreboot/macbook11/warn.txt b/config/coreboot/macbook11/warn.txt deleted file mode 100644 index 5bffd9da..00000000 --- a/config/coreboot/macbook11/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Presumably fully stable, but see lbmk issue 179: https://codeberg.org/libreboot/lbmk/issues/179 - T60 on just battery power had the error in GRUB: alloc magic is broken at 0x7b1aedf0: 0 ----- the rev for Libreboot 2024050x is set to the LB 202306235 rev (February 2023) for now. I still think the users with that issue, and there weren't that many, just had bad RAM. GRUB shows that error on bad RAM, and I've seen it in that case on other machines too. So this machine is most likely fully stable, but I'm marking it unstable until we know fully what we're dealing with. diff --git a/config/coreboot/macbook11_16mb/target.cfg b/config/coreboot/macbook11_16mb/target.cfg index 3c06a458..38046653 100644 --- a/config/coreboot/macbook11_16mb/target.cfg +++ b/config/coreboot/macbook11_16mb/target.cfg @@ -4,4 +4,4 @@ payload_grub="y" payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" -status="unstable" +status="stable" diff --git a/config/coreboot/macbook11_16mb/warn.txt b/config/coreboot/macbook11_16mb/warn.txt deleted file mode 100644 index 5bffd9da..00000000 --- a/config/coreboot/macbook11_16mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Presumably fully stable, but see lbmk issue 179: https://codeberg.org/libreboot/lbmk/issues/179 - T60 on just battery power had the error in GRUB: alloc magic is broken at 0x7b1aedf0: 0 ----- the rev for Libreboot 2024050x is set to the LB 202306235 rev (February 2023) for now. I still think the users with that issue, and there weren't that many, just had bad RAM. GRUB shows that error on bad RAM, and I've seen it in that case on other machines too. So this machine is most likely fully stable, but I'm marking it unstable until we know fully what we're dealing with. diff --git a/config/coreboot/macbook21/target.cfg b/config/coreboot/macbook21/target.cfg index b4feb4de..27d71b5a 100644 --- a/config/coreboot/macbook21/target.cfg +++ b/config/coreboot/macbook21/target.cfg @@ -5,4 +5,4 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="unstable" +status="stable" diff --git a/config/coreboot/macbook21/warn.txt b/config/coreboot/macbook21/warn.txt deleted file mode 100644 index 5bffd9da..00000000 --- a/config/coreboot/macbook21/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Presumably fully stable, but see lbmk issue 179: https://codeberg.org/libreboot/lbmk/issues/179 - T60 on just battery power had the error in GRUB: alloc magic is broken at 0x7b1aedf0: 0 ----- the rev for Libreboot 2024050x is set to the LB 202306235 rev (February 2023) for now. I still think the users with that issue, and there weren't that many, just had bad RAM. GRUB shows that error on bad RAM, and I've seen it in that case on other machines too. So this machine is most likely fully stable, but I'm marking it unstable until we know fully what we're dealing with. diff --git a/config/coreboot/macbook21_16mb/target.cfg b/config/coreboot/macbook21_16mb/target.cfg index b4feb4de..27d71b5a 100644 --- a/config/coreboot/macbook21_16mb/target.cfg +++ b/config/coreboot/macbook21_16mb/target.cfg @@ -5,4 +5,4 @@ payload_grub_withseabios="y" payload_seabios="y" payload_memtest="y" grub_scan_disk="ahci" -status="unstable" +status="stable" diff --git a/config/coreboot/macbook21_16mb/warn.txt b/config/coreboot/macbook21_16mb/warn.txt deleted file mode 100644 index 5bffd9da..00000000 --- a/config/coreboot/macbook21_16mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Presumably fully stable, but see lbmk issue 179: https://codeberg.org/libreboot/lbmk/issues/179 - T60 on just battery power had the error in GRUB: alloc magic is broken at 0x7b1aedf0: 0 ----- the rev for Libreboot 2024050x is set to the LB 202306235 rev (February 2023) for now. I still think the users with that issue, and there weren't that many, just had bad RAM. GRUB shows that error on bad RAM, and I've seen it in that case on other machines too. So this machine is most likely fully stable, but I'm marking it unstable until we know fully what we're dealing with. diff --git a/config/coreboot/t60_16mb_intelgpu/target.cfg b/config/coreboot/t60_16mb_intelgpu/target.cfg index 004ba1b0..bb3decba 100644 --- a/config/coreboot/t60_16mb_intelgpu/target.cfg +++ b/config/coreboot/t60_16mb_intelgpu/target.cfg @@ -5,4 +5,4 @@ payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" grub_background="background1024x768.png" -status="unstable" +status="stable" diff --git a/config/coreboot/t60_16mb_intelgpu/warn.txt b/config/coreboot/t60_16mb_intelgpu/warn.txt deleted file mode 100644 index 5bffd9da..00000000 --- a/config/coreboot/t60_16mb_intelgpu/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Presumably fully stable, but see lbmk issue 179: https://codeberg.org/libreboot/lbmk/issues/179 - T60 on just battery power had the error in GRUB: alloc magic is broken at 0x7b1aedf0: 0 ----- the rev for Libreboot 2024050x is set to the LB 202306235 rev (February 2023) for now. I still think the users with that issue, and there weren't that many, just had bad RAM. GRUB shows that error on bad RAM, and I've seen it in that case on other machines too. So this machine is most likely fully stable, but I'm marking it unstable until we know fully what we're dealing with. diff --git a/config/coreboot/t60_intelgpu/target.cfg b/config/coreboot/t60_intelgpu/target.cfg index 004ba1b0..bb3decba 100644 --- a/config/coreboot/t60_intelgpu/target.cfg +++ b/config/coreboot/t60_intelgpu/target.cfg @@ -5,4 +5,4 @@ payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" grub_background="background1024x768.png" -status="unstable" +status="stable" diff --git a/config/coreboot/t60_intelgpu/warn.txt b/config/coreboot/t60_intelgpu/warn.txt deleted file mode 100644 index 5bffd9da..00000000 --- a/config/coreboot/t60_intelgpu/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Presumably fully stable, but see lbmk issue 179: https://codeberg.org/libreboot/lbmk/issues/179 - T60 on just battery power had the error in GRUB: alloc magic is broken at 0x7b1aedf0: 0 ----- the rev for Libreboot 2024050x is set to the LB 202306235 rev (February 2023) for now. I still think the users with that issue, and there weren't that many, just had bad RAM. GRUB shows that error on bad RAM, and I've seen it in that case on other machines too. So this machine is most likely fully stable, but I'm marking it unstable until we know fully what we're dealing with. diff --git a/config/coreboot/x60/target.cfg b/config/coreboot/x60/target.cfg index 004ba1b0..bb3decba 100644 --- a/config/coreboot/x60/target.cfg +++ b/config/coreboot/x60/target.cfg @@ -5,4 +5,4 @@ payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" grub_background="background1024x768.png" -status="unstable" +status="stable" diff --git a/config/coreboot/x60/warn.txt b/config/coreboot/x60/warn.txt deleted file mode 100644 index 5bffd9da..00000000 --- a/config/coreboot/x60/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Presumably fully stable, but see lbmk issue 179: https://codeberg.org/libreboot/lbmk/issues/179 - T60 on just battery power had the error in GRUB: alloc magic is broken at 0x7b1aedf0: 0 ----- the rev for Libreboot 2024050x is set to the LB 202306235 rev (February 2023) for now. I still think the users with that issue, and there weren't that many, just had bad RAM. GRUB shows that error on bad RAM, and I've seen it in that case on other machines too. So this machine is most likely fully stable, but I'm marking it unstable until we know fully what we're dealing with. diff --git a/config/coreboot/x60_16mb/target.cfg b/config/coreboot/x60_16mb/target.cfg index 004ba1b0..bb3decba 100644 --- a/config/coreboot/x60_16mb/target.cfg +++ b/config/coreboot/x60_16mb/target.cfg @@ -5,4 +5,4 @@ payload_grub_withseabios="y" payload_seabios="y" grub_scan_disk="ahci" grub_background="background1024x768.png" -status="unstable" +status="stable" diff --git a/config/coreboot/x60_16mb/warn.txt b/config/coreboot/x60_16mb/warn.txt deleted file mode 100644 index 5bffd9da..00000000 --- a/config/coreboot/x60_16mb/warn.txt +++ /dev/null @@ -1 +0,0 @@ -Presumably fully stable, but see lbmk issue 179: https://codeberg.org/libreboot/lbmk/issues/179 - T60 on just battery power had the error in GRUB: alloc magic is broken at 0x7b1aedf0: 0 ----- the rev for Libreboot 2024050x is set to the LB 202306235 rev (February 2023) for now. I still think the users with that issue, and there weren't that many, just had bad RAM. GRUB shows that error on bad RAM, and I've seen it in that case on other machines too. So this machine is most likely fully stable, but I'm marking it unstable until we know fully what we're dealing with. diff --git a/config/grub/bootorder b/config/grub/bootorder new file mode 100644 index 00000000..b33e1295 --- /dev/null +++ b/config/grub/bootorder @@ -0,0 +1 @@ +/rom@img/grub2 diff --git a/include/err.sh b/include/err.sh index 0b1c3e70..a94275f3 100755 --- a/include/err.sh +++ b/include/err.sh @@ -5,7 +5,7 @@ export LC_COLLATE=C export LC_ALL=C version=""; versiondate=""; projectname=""; _nogit="" -err="err_"; tmpdir=""; release_type=""; lbmk_status="" +err="err_"; tmpdir=""; lbmk_status="" # 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) @@ -15,17 +15,6 @@ set | grep LBMK_RELEASE 1>/dev/null 2>/dev/null || lbmk_release="n" || : [ "$lbmk_release" = "n" ] || [ "$lbmk_release" = "y" ] || lbmk_release="n" export LBMK_RELEASE="$lbmk_release" -# valid values: -# empty / not set -# value: stable -# value: unstable -# e.g. export LBMK_VERSION_TYPE=stable -set | grep LBMK_VERSION_TYPE 1>/dev/null 2>/dev/null && \ - release_type="$LBMK_VERSION_TYPE" -[ -z "$release_type" ] || [ "$release_type" = "stable" ] || \ - [ "$release_type" = "unstable" ] || release_type="" -export LBMK_VERSION_TYPE="$release_type" - # 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 lbmk, prior to the checks. diff --git a/script/build/roms b/script/build/roms index 853bbea6..1ed64004 100755 --- a/script/build/roms +++ b/script/build/roms @@ -33,10 +33,6 @@ main() while [ $# -gt 0 ]; do if [ "$listboards" = "y" ]; then - [ "$1" = "stable" ] || [ "$1" = "unstable" ] || \ - [ "$1" = "broken" ] || [ "$1" = "untested" ] || \ - [ "$1" = "unknown" ] || \ - $err "invalid list type '$1'" list_type="$list_type $1" list_type="${list_type# }" shift 1; continue @@ -62,9 +58,6 @@ main() shift 2 done - [ "$listboards" = "y" ] && [ -z "$list_type" ] && \ - list_type="stable unstable broken untested unknown" - [ "${all}" != "y" ] || boards=$(items config/coreboot) || \ $err "Cannot generate list of boards for building" @@ -72,19 +65,18 @@ main() eval "$(setvars "n" ${pv}) $(setvars "" ${v})" grub_background="background1280x800.png" board="${x}" + status="unknown" configure_target [ "$board" = "$tree" ] && \ continue - handle_status - if [ "$listboards" = "y" ]; then + [ -z "$list_type" ] && printf "%s\n" "$board" for _list_type in $list_type; do [ "$status" != "$_list_type" ] && continue printf "%s\n" "$board" - done - continue + done; continue fi # exclude certain targets from the release @@ -163,50 +155,33 @@ configure_target() eval "payload_${_payload}=y" } -handle_status() -{ - [ "$status" = "stable" ] || [ "$status" = "unstable" ] || \ - [ "$status" = "broken" ] || [ "$status" = "untested" ] || \ - status="unknown" - - [ "$listboards" != "y" ] && \ - printf "Handling target: %s (status=%s)\n" "$board" "$status" - - [ "$status" = "broken" ] && release="n" - [ "$status" = "unknown" ] && release="n" - [ "$status" = "untested" ] && release="n" - - [ "$listboards" != "y" ] && \ - [ "$status" != "stable" ] && [ "$status" != "$release_type" ] && \ - printf "WARNING: %s not marked stable (status=%s):\n\n" \ - "$board" "$status"; return 0 -} - skip_board() { - [ "$release" = "n" ] && [ "$lbmk_release" = "y" ] && \ - return 0 - [ -n "$release_type" ] && [ "$status" = "$release_type" ] && \ - return 1 - - if [ "$lbmk_release" != "y" ] && [ "$status" != "stable" ] && \ - [ "$status" != "$release_type" ] && [ "$lbmk_status" = "y" ]; then - if [ -f "$targetdir/warn.txt" ]; then - printf "Regarding board '%s' (status '%s'):\n" \ - "$board" "$status" - cat -u "$targetdir/warn.txt" || \ - $err "!cat $targetdir/warn.txt" - fi - printf "\nTo disable this dialog when building, do:\n" - printf "export LBMK_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 - fi; return 1 + [ "$listboards" != "y" ] && [ "$status" != "stable" ] && \ + printf "WARNING: %s not stable (status=%s):\n\n" \ + "$board" "$status" + + if [ -f "$targetdir/warn.txt" ] && [ "$listboards" != "y" ]; then + printf "Regarding board '%s' (status '%s'):\n" \ + "$board" "$status" + cat -u "$targetdir/warn.txt" || \ + $err "!cat $targetdir/warn.txt" + fi + + [ "$lbmk_release" = "y" ] && [ "$release" = "n" ] && return 0 + [ "$lbmk_release" = "y" ] && [ "$status" != "broken" ] && return 1 + [ "$lbmk_status" = "y" ] || return 1 + [ "$status" = "stable" ] && return 1 + + printf "\nTo disable this dialog when building, do:\n" + printf "export LBMK_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() @@ -399,8 +374,12 @@ build_grub_roms() newrom="${newrom}${initmode}_${keymap}.rom" x_ moverom "${tmpgrubrom}" "${newrom}" if [ "${payload_seabios_grubonly}" = "y" ]; then - mkSeagrubRom "${tmpgrubrom}" "${newrom}" - mkSeabiosGrubonlyRom "${tmpgrubrom}" "${newrom}" + x_ "$cbfstool" "$tmpgrubrom" add \ + -f "config/grub/bootorder" -n bootorder -t raw + x_ moverom "$tmpgrubrom" "${newrom%.rom}_grubfirst.rom" + x_ "$cbfstool" "$tmpgrubrom" add-int -i 0 \ + -n etc/show-boot-menu + x_ moverom "$tmpgrubrom" "${newrom%.rom}_grubonly.rom" fi x_ rm -f "${tmpgrubrom}" done @@ -429,34 +408,6 @@ mkSeabiosRom() { printf "%s\n" "${tmprom}" } -# SeaGRUB configuration -mkSeagrubRom() -{ - _grubrom="${1}" - _newrom="${2}" - - tmpbootorder=$(mktemp -t coreboot_rom.XXXXXXXXXX) - - # only load grub, by inserting a custom bootorder file - printf "/rom@img/grub2\n" > "$tmpbootorder" || $err "printf bootorder" - x_ "${cbfstool}" "${_grubrom}" \ - add -f "${tmpbootorder}" -n bootorder -t raw - x_ rm -f "${tmpbootorder}" - - x_ moverom "${_grubrom}" "${_newrom%.rom}_grubfirst.rom" -} - -# SeaGRUB, and disable the SeaBIOS menu (grub only) -mkSeabiosGrubonlyRom() -{ - _grubrom="${1}" - _newrom="${2}" - - x_ "${cbfstool}" "${_grubrom}" add-int -i 0 -n etc/show-boot-menu - - x_ moverom "${_grubrom}" "${_newrom%.rom}_grubonly.rom" -} - build_uboot_roms() { tmprom=$(mkUbootRom "${cbrom}" "fallback/payload") || \ |