coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-16 13:16:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: coja/lbmk:20241205
Branches Tags
coja/lbmk:master coja/lbmk:26.01_branch coja/lbmk:x270wip coja/lbmk:chromebookwip1 coja/lbmk:25.06_branch coja/lbmk:25.04_branch coja/lbmk:20241206_branch coja/lbmk:20241206-t480-thunderbolt-unstable coja/lbmk:m920qwip coja/lbmk:3050wip coja/lbmk:20240612_branch coja/lbmk:quackboot coja/lbmk:audit6 coja/lbmk:9020tpm coja/lbmk:haswell/nri-update coja/lbmk:9020nri coja/lbmk:9020vga coja/lbmk:btrfsvols coja/lbmk:a88hm_test coja/lbmk:msater coja/lbmk:testxz coja/lbmk:fsdg20230625
coja/lbmk:26.01rev1 coja/lbmk:26.01 coja/lbmk:26.01rc4 coja/lbmk:26.01rc3 coja/lbmk:26.01rc2 coja/lbmk:26.01rc1 coja/lbmk:25.06 coja/lbmk:25.04rev1 coja/lbmk:25.04 coja/lbmk:20241206rev11 coja/lbmk:20241206rev10 coja/lbmk:20241206rev9 coja/lbmk:20241206rev8 coja/lbmk:20241206rev7 coja/lbmk:20241206rev6 coja/lbmk:20241206rev5 coja/lbmk:20241206rev4 coja/lbmk:20241206rev3 coja/lbmk:20241206rev2 coja/lbmk:20241206rev1 coja/lbmk:20241206 coja/lbmk:20241205 coja/lbmk:20241008 coja/lbmk:20240612rev3 coja/lbmk:20240612rev2 coja/lbmk:20240612rev1 coja/lbmk:20240612 coja/lbmk:20240504 coja/lbmk:20240225 coja/lbmk:20240126 coja/lbmk:20231106 coja/lbmk:20231101 coja/lbmk:20231021fix2 coja/lbmk:20231021fix coja/lbmk:20231021 coja/lbmk:c20230710 coja/lbmk:20230625 coja/lbmk:20230423 coja/lbmk:20230413 coja/lbmk:20230319 coja/lbmk:20221214 coja/lbmk:psdg coja/lbmk:20220710 coja/lbmk:20211122 coja/lbmk:20210522
..
compare: coja/lbmk:20241206
Branches Tags
coja/lbmk:master coja/lbmk:26.01_branch coja/lbmk:x270wip coja/lbmk:chromebookwip1 coja/lbmk:25.06_branch coja/lbmk:25.04_branch coja/lbmk:20241206_branch coja/lbmk:20241206-t480-thunderbolt-unstable coja/lbmk:m920qwip coja/lbmk:3050wip coja/lbmk:20240612_branch coja/lbmk:quackboot coja/lbmk:audit6 coja/lbmk:9020tpm coja/lbmk:haswell/nri-update coja/lbmk:9020nri coja/lbmk:9020vga coja/lbmk:btrfsvols coja/lbmk:a88hm_test coja/lbmk:msater coja/lbmk:testxz coja/lbmk:fsdg20230625
coja/lbmk:26.01rev1 coja/lbmk:26.01 coja/lbmk:26.01rc4 coja/lbmk:26.01rc3 coja/lbmk:26.01rc2 coja/lbmk:26.01rc1 coja/lbmk:25.06 coja/lbmk:25.04rev1 coja/lbmk:25.04 coja/lbmk:20241206rev11 coja/lbmk:20241206rev10 coja/lbmk:20241206rev9 coja/lbmk:20241206rev8 coja/lbmk:20241206rev7 coja/lbmk:20241206rev6 coja/lbmk:20241206rev5 coja/lbmk:20241206rev4 coja/lbmk:20241206rev3 coja/lbmk:20241206rev2 coja/lbmk:20241206rev1 coja/lbmk:20241206 coja/lbmk:20241205 coja/lbmk:20241008 coja/lbmk:20240612rev3 coja/lbmk:20240612rev2 coja/lbmk:20240612rev1 coja/lbmk:20240612 coja/lbmk:20240504 coja/lbmk:20240225 coja/lbmk:20240126 coja/lbmk:20231106 coja/lbmk:20231101 coja/lbmk:20231021fix2 coja/lbmk:20231021fix coja/lbmk:20231021 coja/lbmk:c20230710 coja/lbmk:20230625 coja/lbmk:20230423 coja/lbmk:20230413 coja/lbmk:20230319 coja/lbmk:20221214 coja/lbmk:psdg coja/lbmk:20220710 coja/lbmk:20211122 coja/lbmk:20210522

4 Commits
20241205 .. 20241206

Author SHA1 Message Date
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
7 changed files with 7 additions and 7 deletions
Expand all files Collapse all files
config/grub/default/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+1 -1
View File
@@ -16,7 +16,7 @@ index bd4431000..300f55fe1 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 (_("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) if (!msg_formatted)
return; return;
config/grub/nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+1 -1
View File
@@ -16,7 +16,7 @@ index bd4431000..300f55fe1 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 (_("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) if (!msg_formatted)
return; return;
config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch
+1 -1
View File
@@ -16,7 +16,7 @@ index bd4431000..300f55fe1 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 (_("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) if (!msg_formatted)
return; return;
config/u-boot/default/patches/0007-Libreboot-branding-version-on-the-bootflow-menu.patch
+1 -1
View File
@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 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);
+ "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); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
logo = video_get_u_boot_logo(); logo = video_get_u_boot_logo();
config/u-boot/x86/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
+1 -1
View File
@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 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);
+ "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); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
logo = video_get_u_boot_logo(); logo = video_get_u_boot_logo();
config/u-boot/x86_64/patches/0005-Libreboot-branding-version-on-the-bootflow-menu.patch
+1 -1
View File
@@ -18,7 +18,7 @@ index 84831915a2..8e26ec2aef 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);
+ "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); ret |= scene_menu_set_title(scn, OBJ_MENU, OBJ_PROMPT);
logo = video_get_u_boot_logo(); logo = video_get_u_boot_logo();
include/vendor.sh
+1 -1
View File
@@ -180,7 +180,7 @@ extract_archive()
innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \ innoextract "$1" -d "$2" || python "$pfs_extract" "$1" -e || 7z x \
"$1" -o"$2" || unar "$1" -o "$2" || unzip "$1" -d "$2" || return 1 "$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'"; : $err "!mv '${_dl}_extracted' '$2'"; :
} }