From a223a0db89d2bd9134405debd955b09c2c4a8626 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 7 Jan 2025 08:24:40 +0000 Subject: [PATCH] update u-boot/grub/seabios version displays Signed-off-by: Leah Rowe --- ...-the-name-libreboot-in-the-grub-menu.patch | 4 +-- ...-the-name-libreboot-in-the-grub-menu.patch | 4 +-- ...-the-name-libreboot-in-the-grub-menu.patch | 4 +-- ...anoeboot-version-in-the-SeaBIOS-menu.patch | 26 +++++++++++++++++++ .../patches/0007-Canuboot-branding.patch | 2 +- .../x86/patches/0005-Canuboot-branding.patch | 2 +- .../patches/0005-Canuboot-branding.patch | 2 +- 7 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 config/seabios/default/patches/0003-Print-the-Canoeboot-version-in-the-SeaBIOS-menu.patch diff --git a/config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch index 5c17270..0cc4b5a 100644 --- a/config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch +++ b/config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch @@ -1,7 +1,7 @@ From 10d264bdfde24fcf78da6f641898eb267f83066f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 19 Nov 2022 16:30:24 +0000 -Subject: [PATCH 02/13] say the name libreboot, in the grub menu +Subject: [PATCH 02/13] say the name canoeboot, in the grub menu --- grub-core/normal/main.c | 2 +- @@ -16,7 +16,7 @@ index bd4431000..ff16e0f2e 100644 grub_term_cls (term); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); -+ msg_formatted = grub_xasprintf (_("Canoeboot 20241207 release, based on coreboot. https://canoeboot.org/")); ++ msg_formatted = grub_xasprintf (_("Canoeboot 20250107 (GRUB menu): https://canoeboot.org/")); if (!msg_formatted) return; diff --git a/config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch index 56b2d24..ecdb482 100644 --- a/config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch +++ b/config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch @@ -1,7 +1,7 @@ From f9ae737976ff52fc656459942dd0bdbd763e66df Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 19 Nov 2022 16:30:24 +0000 -Subject: [PATCH 02/14] say the name libreboot, in the grub menu +Subject: [PATCH 02/14] say the name canoeboot, in the grub menu --- grub-core/normal/main.c | 2 +- @@ -16,7 +16,7 @@ index bd4431000..ff16e0f2e 100644 grub_term_cls (term); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); -+ msg_formatted = grub_xasprintf (_("Canoeboot 20241207 release, based on coreboot. https://canoeboot.org/")); ++ msg_formatted = grub_xasprintf (_("Canoeboot 20250107 (GRUB menu): https://canoeboot.org/")); if (!msg_formatted) return; diff --git a/config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch index 0e3a1af..ad9dae6 100644 --- a/config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch +++ b/config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch @@ -1,7 +1,7 @@ From da775eafbe79e3100ca2262bde49e3e65978e83f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 19 Nov 2022 16:30:24 +0000 -Subject: [PATCH 02/22] say the name libreboot, in the grub menu +Subject: [PATCH 02/22] say the name canoeboot, in the grub menu --- grub-core/normal/main.c | 2 +- @@ -16,7 +16,7 @@ index bd4431000..ff16e0f2e 100644 grub_term_cls (term); - msg_formatted = grub_xasprintf (_("GNU GRUB version %s"), PACKAGE_VERSION); -+ msg_formatted = grub_xasprintf (_("Canoeboot 20241207 release, based on coreboot. https://canoeboot.org/")); ++ msg_formatted = grub_xasprintf (_("Canoeboot 20250107 (GRUB menu): https://canoeboot.org/")); if (!msg_formatted) return; diff --git a/config/seabios/default/patches/0003-Print-the-Canoeboot-version-in-the-SeaBIOS-menu.patch b/config/seabios/default/patches/0003-Print-the-Canoeboot-version-in-the-SeaBIOS-menu.patch new file mode 100644 index 0000000..8efa241 --- /dev/null +++ b/config/seabios/default/patches/0003-Print-the-Canoeboot-version-in-the-SeaBIOS-menu.patch @@ -0,0 +1,26 @@ +From ebd8293eb1af20c204beb3aa1394865185e2f3f0 Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Mon, 6 Jan 2025 18:49:58 +0000 +Subject: [PATCH 1/1] Print the Canoeboot version in the SeaBIOS menu + +Signed-off-by: Leah Rowe +--- + src/bootsplash.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootsplash.c b/src/bootsplash.c +index 538b316d..8746098c 100644 +--- a/src/bootsplash.c ++++ b/src/bootsplash.c +@@ -48,7 +48,7 @@ enable_vga_console(void) + call16_int10(&br); + + // Write to screen. +- printf("SeaBIOS (version %s)\n", VERSION); ++ printf("Canoeboot 20250107 (SeaBIOS menu): https://canoeboot.org/\n"); + display_uuid(); + } + +-- +2.39.5 + diff --git a/config/u-boot/default/patches/0007-Canuboot-branding.patch b/config/u-boot/default/patches/0007-Canuboot-branding.patch index 2208773..972568d 100644 --- a/config/u-boot/default/patches/0007-Canuboot-branding.patch +++ b/config/u-boot/default/patches/0007-Canuboot-branding.patch @@ -18,7 +18,7 @@ index 84831915a2..318dbf8b8b 100644 ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, - "U-Boot - Boot Menu", NULL); -+ "Canoeboot 20241207 release (U-Boot Menu) https://canoeboot.org/", NULL); ++ "Canoeboot 20250107 (U-Boot menu): https://canoeboot.org/", NULL); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); logo = video_get_u_boot_logo(); diff --git a/config/u-boot/x86/patches/0005-Canuboot-branding.patch b/config/u-boot/x86/patches/0005-Canuboot-branding.patch index eee093e..fcf8cc4 100644 --- a/config/u-boot/x86/patches/0005-Canuboot-branding.patch +++ b/config/u-boot/x86/patches/0005-Canuboot-branding.patch @@ -18,7 +18,7 @@ index 84831915a2..318dbf8b8b 100644 ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, - "U-Boot - Boot Menu", NULL); -+ "Canoeboot 20241207 release (U-Boot Menu) https://canoeboot.org/", NULL); ++ "Canoeboot 20250107 (U-Boot menu): https://canoeboot.org/", NULL); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); logo = video_get_u_boot_logo(); diff --git a/config/u-boot/x86_64/patches/0005-Canuboot-branding.patch b/config/u-boot/x86_64/patches/0005-Canuboot-branding.patch index eee093e..fcf8cc4 100644 --- a/config/u-boot/x86_64/patches/0005-Canuboot-branding.patch +++ b/config/u-boot/x86_64/patches/0005-Canuboot-branding.patch @@ -18,7 +18,7 @@ index 84831915a2..318dbf8b8b 100644 ret |= scene_obj_set_pos(scn, OBJ_MENU, MARGIN_LEFT, 100); ret |= scene_txt_str(scn, "title", OBJ_MENU_TITLE, STR_MENU_TITLE, - "U-Boot - Boot Menu", NULL); -+ "Canoeboot 20241207 release (U-Boot Menu) https://canoeboot.org/", NULL); ++ "Canoeboot 20250107 (U-Boot menu): https://canoeboot.org/", NULL); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT); logo = video_get_u_boot_logo();