fix the stupidest bug ever

no context given, but every rom needs to be re-built. Signed-off-by: Leah Rowe <leah@libreboot.org>
Revert "vendor.sh: avoid unnecessary directory copy"
2026-03-25 21:39:03 +02:00 · 2024-12-08 18:04:51 +00:00 · 2024-12-06 10:34:36 +00:00 · 2024-12-06 10:06:38 +00:00 · 2024-12-06 01:53:44 +00:00 · 2024-12-06 01:24:35 +00:00
8 changed files with 8 additions and 8 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 bd4431000..300f55fe1 100644
   grub_term_cls (term);
 
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 20241205 release, based on coreboot.    https://libreboot.org/"));
+  msg_formatted = grub_xasprintf (_("Libreboot 20241206 release, based on coreboot.    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 bd4431000..300f55fe1 100644
   grub_term_cls (term);
 
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 20241205 release, based on coreboot.    https://libreboot.org/"));
+  msg_formatted = grub_xasprintf (_("Libreboot 20241206 release, based on coreboot.    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 bd4431000..300f55fe1 100644
   grub_term_cls (term);
 
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
-+  msg_formatted = grub_xasprintf (_("Libreboot 20241205 release, based on coreboot.    https://libreboot.org/"));
+  msg_formatted = grub_xasprintf (_("Libreboot 20241206 release, based on coreboot.    https://libreboot.org/"));
   if (!msg_formatted)
     return;
 
--- 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 20241205 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
+	    "Libreboot 20241206 release (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 20241205 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
+	    "Libreboot 20241206 release (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 20241205 release (U-Boot Menu)                                                    https://libreboot.org/", NULL);
+	    "Libreboot 20241206 release (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/rom.sh
+++ b/include/rom.sh
@@ -214,7 +214,7 @@ add_uboot()
 	    ubootelf="$ubdir/u-boot-x86-with-spl.bin" # EFI-compatible

 	[ -f "$ubootelf" ] || $err "cb/$ubtarget: Can't find u-boot"
-	cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs; cprom
+	cbfs "$tmprom" "$ubootelf" "$ubpath" $ubcbfsargs
 }

 cprom()
--- a/include/vendor.sh
+++ b/include/vendor.sh
@@ -180,7 +180,7 @@ extract_archive()
 	    innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
 	    "$1" -o"$2" || unar "$1" -o "$2" || unzip "$1" -d "$2" || return 1

-	[ ! -d "${_dl}_extracted" ] || mv "${_dl}_extracted" "$2" || \
+	[ ! -d "${_dl}_extracted" ] || cp -R "${_dl}_extracted" "$2" || \
 	    $err "!mv '${_dl}_extracted' '$2'"; :
 }
Author	SHA1	Message	Date
Leah Rowe	e3b77b132e	fix the stupidest bug ever no context given, but every rom needs to be re-built. Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-08 18:04:51 +00:00
Leah Rowe	e80261dd54	Revert "vendor.sh: avoid unnecessary directory copy" Nope. It was correct before. fml This reverts commit `2d96fe2a1d`.	2024-12-06 10:34:36 +00:00
Leah Rowe	ec581bde47	Libreboot `20241206` release Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-06 10:06:38 +00:00
Leah Rowe	2d96fe2a1d	vendor.sh: avoid unnecessary directory copy the previous commit changed an mv to a cp. what it hacked was actually a relic of the vgarom download patch that i did for t480, before mate got native video init working. this patch is the better fix. i double checked to be sure, and nothing was using the files at the copied location. the _extracted directory under cache gets deleted later on, so it's perfectly acceptable to keep. the other alternative would have been to simply change the path in the sch5545 function to appdir, instead of the cache dir, but who really cares? this patch removes bloat from lbmk. Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-06 01:53:44 +00:00
Leah Rowe	2dc7c5fa72	vendor.sh: fix minor release bug I should have copied the extract directory, in cases where it appears as filename_extracted/ under cache/, but I was moving it instead. Both locations (cache/file/*_extracted/ and vendorfiles/appdir/) get deleted, on every run of the vendor script, per target, so this is OK. The only sin is additional use of disk space, for archives that are mostly very small and get immediately deleted anyway. This one lbmk bug, minor though it may be, prevented the Libreboot `20241205` release, which (since it's now the 6th of December) will become Libreboot `20241206` instead - and that gives me time to contemplate whether I want to do one more change that I had planned for the 5th! Signed-off-by: Leah Rowe <leah@libreboot.org>	2024-12-06 01:24:35 +00:00