Libreboot 25.06 release

Signed-off-by: Leah Rowe <leah@libreboot.org>
tree.sh: add sha512 error for check_project_hashes
2026-03-25 21:39:03 +02:00 · 2025-06-30 14:08:48 +01:00 · 2025-06-05 23:41:09 +01:00 · 2025-06-05 23:41:03 +01:00 · 2025-06-05 23:40:33 +01:00 · 2025-06-05 23:39:57 +01:00
10 changed files with 16 additions and 12 deletions
--- 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
@@ -16,7 +16,7 @@ index 04d058f55..b1cc8f236 100644
   grub_term_cls (term);
 
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 25.04 Corny Calamity (GRUB menu): https://libreboot.org/"));
+  msg_formatted = grub_xasprintf (_("Libreboot 25.06 Luminous Lemon (GRUB menu): https://libreboot.org/"));
   if (!msg_formatted)
     return;
 
--- 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
@@ -16,7 +16,7 @@ index 04d058f55..b1cc8f236 100644
   grub_term_cls (term);
 
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 25.04 Corny Calamity (GRUB menu): https://libreboot.org/"));
+  msg_formatted = grub_xasprintf (_("Libreboot 25.06 Luminous Lemon (GRUB menu): https://libreboot.org/"));
   if (!msg_formatted)
     return;
 
--- 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
@@ -16,7 +16,7 @@ index 04d058f55..b1cc8f236 100644
   grub_term_cls (term);
 
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 25.04 Corny Calamity (GRUB menu): https://libreboot.org/"));
+  msg_formatted = grub_xasprintf (_("Libreboot 25.06 Luminous Lemon (GRUB menu): https://libreboot.org/"));
   if (!msg_formatted)
     return;
 
--- a/config/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch
+++ b/config/seabios/default/patches/0003-Print-the-Libreboot-version-in-the-SeaBIOS-menu.patch
@@ -17,7 +17,7 @@ index 538b316d..9eed0b12 100644
 
     // Write to screen.
 -    printf("SeaBIOS (version %s)\n", VERSION);
-+    printf("Libreboot 25.04 Corny Calamity (SeaBIOS menu): https://libreboot.org/\n");
+    printf("Libreboot 25.06 Luminous Lemon (SeaBIOS menu): https://libreboot.org/\n");
     display_uuid();
 }
 
--- a/config/submodule/docs/html/module.cfg
+++ b/config/submodule/docs/html/module.cfg
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

-subhash="47c993cba483ff23a4c7b866c6cedcc905e9a2bd"
+subhash="2fc8efd375aef58d6c5d6b8e4ffe87b3bd2ff3d4"
 subgit="https://codeberg.org/libreboot/lbwww"
 subgit_bkup="https://git.disroot.org/libreboot/lbwww"
--- a/config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch
+++ b/config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch
@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 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);
-+	    "Libreboot 25.04 Corny Calamity (U-Boot menu): https://libreboot.org/", NULL);
+	    "Libreboot 25.06 Luminous Lemon (U-Boot menu): https://libreboot.org/", NULL);
 	ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
 
 	logo = video_get_u_boot_logo();
--- a/config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
+++ b/config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 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);
-+	    "Libreboot 25.04 Corny Calamity (U-Boot menu): https://libreboot.org/", NULL);
+	    "Libreboot 25.06 Luminous Lemon (U-Boot menu): https://libreboot.org/", NULL);
 	ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
 
 	logo = video_get_u_boot_logo();
--- a/config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
+++ b/config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 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);
-+	    "Libreboot 25.04 Corny Calamity (U-Boot menu): https://libreboot.org/", NULL);
+	    "Libreboot 25.06 Luminous Lemon (U-Boot menu): https://libreboot.org/", NULL);
 	ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
 
 	logo = video_get_u_boot_logo();
--- a/include/inject.sh
+++ b/include/inject.sh
@@ -65,7 +65,7 @@ check_release()
 	*.tar.xz) _stripped_prefix="${archivename#*_}"
 		board="${_stripped_prefix%.tar.xz}" ;;
 	*)
-		err "'$archive': could not detect board type"
+		err "'$archive': could not detect board type" ;;
 	esac; :
 }

--- a/include/tree.sh
+++ b/include/tree.sh
@@ -177,13 +177,15 @@ check_project_hashes()
 {
 	old_pjhash="" && x_ mkdir -p "$XBMK_CACHE/hash"
 	[ ! -f "$XBMK_CACHE/hash/$project$tree" ] || \
-	    read -r old_pjhash < "$XBMK_CACHE/hash/$project$tree"
+	    read -r old_pjhash < "$XBMK_CACHE/hash/$project$tree" || \
+	    err "old_pjhash: Can't read '$XBMK_CACHE/hash/$project$tree'"

 	fx_ "x_ sha512sum" find "$datadir" "$configdir/$tree" "$mdir" \
 	    -type f -not -path "*/.git*/*" | awk '{print $1}' > \
 	    "$xbtmp/project.hash" || err "!h $project $tree"

-	pjhash="$(sha512sum "$xbtmp/project.hash" | awk '{print $1}')" || :
+	pjhash="$(x_ sha512sum "$xbtmp/project.hash" | awk '{print $1}' || \
+	    err)" || err "pjhash: Can't read sha512 of '$xbtmp/project.hash'"
 	[ "$pjhash" != "$old_pjhash" ] && badhash="y"
 	[ -f "$XBMK_CACHE/hash/$project$tree" ] || badhash="y"

@@ -302,8 +304,10 @@ run_make_command()
 	$dry x_ make -C "$srcdir" $mode -j$XBMK_THREADS $makeargs
 	[ -n "$mode" ] || x_ $mkhelper

+	check_makefile "$srcdir" || return 0
 	[ "$mode" != "clean" ] || \
-	    $dry make -C "$srcdir" $cleanargs distclean || :; :
+	    $dry make -C "$srcdir" $cleanargs distclean || \
+	    $dry x_ make -C "$srcdir" $cleanargs clean; :
 }

 check_cmake()
Author	SHA1	Message	Date
Leah Rowe	c46a71138c	Libreboot 25.06 release Signed-off-by: Leah Rowe <leah@libreboot.org>	2025-06-30 14:08:48 +01:00
Leah Rowe	b1ef562b76	tree.sh: add sha512 error for check_project_hashes handle errors on sha512sum - also handle awk errors inside the mini subshell, and provide overall error handling. we know that the project.hash file should always exist, and always be read no matter what; technically, the find command that proceeds it might not yield any results, but an empty file would then be produced. the edge case of an empty file would have lead to an error beforehand, when configuring the project in function, configure_project(), so we've already got that covered. Signed-off-by: Leah Rowe <leah@libreboot.org>	2025-06-05 23:41:09 +01:00
Leah Rowe	04bee3834d	tree.sh: add error check in check_project_hashes() when reading old_pjhash, we need to error out where a read error occurs. such an error is unlikely, but could occur under certain edge cases. Signed-off-by: Leah Rowe <leah@libreboot.org>	2025-06-05 23:41:03 +01:00
Leah Rowe	677dfc4d10	tree.sh: more reliable clean in run_make_command Don't do no-op if it fails; fall back to "clean" instead, and fail if that fails. The no-op was there was not all projects have distclean, but we do intend for them all to be cleaned. We mitigate further error by only running make-clean if a makefile exists. Signed-off-by: Leah Rowe <leah@libreboot.org>	2025-06-05 23:40:33 +01:00
Leah Rowe	267d4c9034	inject.sh: add missing semicolons Signed-off-by: Leah Rowe <leah@libreboot.org>	2025-06-05 23:39:57 +01:00