canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: canoeboot:master
Branches Tags
canoeboot:25.06_branch
canoeboot:master
canoeboot:25.04_branch
canoeboot:20250107_branch
canoeboot:audit2
canoeboot:audit2-merge1
canoeboot:v0.1
canoeboot:klompboot
canoeboot:test
canoeboot:25.04rev1
canoeboot:25.04
canoeboot:20250107rev1
canoeboot:20250107
canoeboot:20241207
canoeboot:20241102
canoeboot:20241031
canoeboot:20240612
canoeboot:20240510
canoeboot:20240504
canoeboot:rel0.1
canoeboot:20231107
canoeboot:20231103
canoeboot:20231101
canoeboot:20231026
...
pull from: canoeboot:25.04_branch
Branches Tags
canoeboot:25.06_branch
canoeboot:master
canoeboot:25.04_branch
canoeboot:20250107_branch
canoeboot:audit2
canoeboot:audit2-merge1
canoeboot:v0.1
canoeboot:klompboot
canoeboot:test
canoeboot:25.04rev1
canoeboot:25.04
canoeboot:20250107rev1
canoeboot:20250107
canoeboot:20241207
canoeboot:20241102
canoeboot:20241031
canoeboot:20240612
canoeboot:20240510
canoeboot:20240504
canoeboot:rel0.1
canoeboot:20231107
canoeboot:20231103
canoeboot:20231101
canoeboot:20231026

8 Commits
master ... 25.04_bran

Author SHA1 Message Date
Leah Rowe 5da5e305a7 Merge branch 'master' into 25.04_branch 2025-05-08 22:19:37 +01:00
Leah Rowe 12920bbd29 Merge branch 'master' into 25.04_branch 2025-05-08 16:10:15 +01:00
Leah Rowe 8cf600eafe Merge branch 'master' into 25.04_branch 2025-05-06 14:50:05 +01:00
Leah Rowe d87a9b78e0 mk: Fix bad error handling for gnu_setver 
I mixed logical OR and AND by mistake. Oops!

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2025-05-05 12:28:32 +01:00
Leah Rowe 5f0c7e30ba lib.sh: set -u -e in err() 
Some parts of lbmk set +u +e, to be reset later on
under normal conditions upon exit. We must ensure
such level of integrity in err() as well.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2025-05-05 12:28:32 +01:00
Leah Rowe c414eba896 Merge branch 'master' into 25.04_branch 2025-05-05 07:37:02 +01:00
Leah Rowe 9ddb92f1dc Merge branch 'master' into 25.04_branch 2025-05-05 07:29:28 +01:00
Leah Rowe d89ac13056 Canoeboot 25.04 rev1 
Rolled back the recent SeaBIOS revision update, which
therefore removes these SeaBIOS patches:

* 9029a010 kconfig: fix the check-lxdialog.sh to work with gcc 14+
* 8863cbbd ahci: add controller reset
* df9dd418 update pci_pad_mem64 handling
* a4fc1845 add romfile_loadbool()
* a2725e28 drop acpi tables and hex includes
* 35aa9a72 drop obsolete acpi table code
* 1b598a1d usb-hid: Support multiple USB HID devices by storing them in a linked list

Technically, I need only revert instead to revision df9dd418, but
that and the other revisions above contain changes that may possibly
cause other breakage.

We know the old revision worked, so roll back these 7 SeaBIOS commits.

Now I will re-compile the 25.04 release and re-upload it as rev1.

This bug was reported on a T420 thinkpad, which Canoeboot doesn't
support, but since that AHCI code is fairly generic, and these
controllers all so similar, it makes sense to just roll back SeaBIOS
on Canoeboot in addition to Libreboot.

Therefore, both Libreboot and Canoeboot will both provide a revision
release for the 25.04 series.

Signed-off-by: Leah Rowe <leah@libreboot.org>
 2025-05-01 14:57:49 +01:00
7 changed files with 7 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
View File

@ -16,7 +16,7 @@ index 04d058f55..b1cc8f236 100644
grub_term_cls (term); grub_term_cls (term);
- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
+ msg_formatted = grub_xasprintf (_("Canoeboot 25.04 Corny Calamity (GRUB menu): https://canoeboot.org/")); + msg_formatted = grub_xasprintf (_("Canoeboot 25.04 rev1 (GRUB menu): https://canoeboot.org/"));
if (!msg_formatted) if (!msg_formatted)
return; return;

2
config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
View File

@ -16,7 +16,7 @@ index 04d058f55..b1cc8f236 100644
grub_term_cls (term); grub_term_cls (term);
- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
+ msg_formatted = grub_xasprintf (_("Canoeboot 25.04 Corny Calamity (GRUB menu): https://canoeboot.org/")); + msg_formatted = grub_xasprintf (_("Canoeboot 25.04 rev1 (GRUB menu): https://canoeboot.org/"));
if (!msg_formatted) if (!msg_formatted)
return; return;

2
config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
View File

@ -16,7 +16,7 @@ index 04d058f55..b1cc8f236 100644
grub_term_cls (term); grub_term_cls (term);
- msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION);
+ msg_formatted = grub_xasprintf (_("Canoeboot 25.04 Corny Calamity (GRUB menu): https://canoeboot.org/")); + msg_formatted = grub_xasprintf (_("Canoeboot 25.04 rev1 (GRUB menu): https://canoeboot.org/"));
if (!msg_formatted) if (!msg_formatted)
return; return;

2
config/seabios/default/patches/0003-Print-the-Canoeboot-version-in-the-SeaBIOS-menu.patch
View File

@ -17,7 +17,7 @@ index 538b316d..9eed0b12 100644
// Write to screen. // Write to screen.
- printf("SeaBIOS (version %s)\n", VERSION); - printf("SeaBIOS (version %s)\n", VERSION);
+ printf("Canoeboot 25.04 Corny Calamity (SeaBIOS menu): https://canoeboot.org/\n"); + printf("Canoeboot 25.04 rev1 (SeaBIOS menu): https://canoeboot.org/\n");
display_uuid(); display_uuid();
} }

2
config/u-boot/default/patches/0007-Canuboot-branding.patch
View File

@ -18,7 +18,7 @@ index 84831915a2..318dbf8b8b 100644
ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
- "U-Boot - Boot Menu", NULL); - "U-Boot - Boot Menu", NULL);
+ "Canoeboot 25.04 Corny Calamity (U-Boot menu): https://canoeboot.org/", NULL); + "Canoeboot 25.04 rev1 (U-Boot menu): https://canoeboot.org/", NULL);
ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
logo = video_get_u_boot_logo(); logo = video_get_u_boot_logo();

2
config/u-boot/x86/patches/0005-Canuboot-branding.patch
View File

@ -18,7 +18,7 @@ index 84831915a2..318dbf8b8b 100644
ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
- "U-Boot - Boot Menu", NULL); - "U-Boot - Boot Menu", NULL);
+ "Canoeboot 25.04 Corny Calamity (U-Boot menu): https://canoeboot.org/", NULL); + "Canoeboot 25.04 rev1 (U-Boot menu): https://canoeboot.org/", NULL);
ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
logo = video_get_u_boot_logo(); logo = video_get_u_boot_logo();

2
config/u-boot/x86_64/patches/0005-Canuboot-branding.patch
View File

@ -18,7 +18,7 @@ index 84831915a2..318dbf8b8b 100644
ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100);
ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE,
- "U-Boot - Boot Menu", NULL); - "U-Boot - Boot Menu", NULL);
+ "Canoeboot 25.04 Corny Calamity (U-Boot menu): https://Canoeboot.org/", NULL); + "Canoeboot 25.04 rev1 (U-Boot menu): https://Canoeboot.org/", NULL);
ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
logo = video_get_u_boot_logo(); logo = video_get_u_boot_logo();