mirror of
https://codeberg.org/canoeboot/cbmk.git
synced 2025-01-10 17:19:57 +00:00
6adbc8680f
changes after libreboot 20231101 were imported, up to libreboot 20231106, and then to revision: c4d90087535617d4fb31ca94803f9426010cfec5 i945 and gm45 configs were re-done, and dell e6400 was moved to its own tree with the ddr2 fix moved there, to prevent breakage on ddr3-based gm45 boards (look at libreboot 20231106 for more info) several fixes are present in this canoeboot release, that were only merged in libreboot *after* the libreboot 20231106 release, and they are: * c4d90087 add grub mods: diskfilter,hashsum,loadenv,setjmp * d0d6decb re-add grub modules: f2fs, json, read, scsi, sleep * 86608721 nvmutil: print usage * f12f5c3a nvmutil: fix makefile the release documentation has also been updated, pulling down newer cbwww and cbwww-img based on the new canoeboot 20231107 release announcement Signed-off-by: Leah Rowe <leah@libreboot.org>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 6237c5762edccc1e1fa4746b1d4aa5e8d81e4883 Mon Sep 17 00:00:00 2001
|
|
From: Leah Rowe <leah@libreboot.org>
|
|
Date: Sun, 5 Nov 2023 16:36:22 +0000
|
|
Subject: [PATCH 1/1] don't print error if module not found
|
|
|
|
still set grub_errno accordingly, and otherwise
|
|
behave the same. in libreboot, we remove a lot of
|
|
modules but then rely on loading a grub.cfg
|
|
provided by a distro; in almost all cases that works,
|
|
but also in almost all cases, that will try to load
|
|
a module we don't actually need, but then it prints
|
|
a message. this can annoy some users, so silence it.
|
|
|
|
Signed-off-by: Leah Rowe <leah@libreboot.org>
|
|
---
|
|
grub-core/kern/dl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
|
|
index af3bd00d0..21d0cedb1 100644
|
|
--- a/grub-core/kern/dl.c
|
|
+++ b/grub-core/kern/dl.c
|
|
@@ -486,7 +486,7 @@ grub_dl_resolve_name (grub_dl_t mod, Elf_Ehdr *e)
|
|
|
|
s = grub_dl_find_section (e, ".modname");
|
|
if (!s)
|
|
- return grub_error (GRUB_ERR_BAD_MODULE, "no module name found");
|
|
+ return (grub_errno = GRUB_ERR_BAD_MODULE);
|
|
|
|
mod->name = grub_strdup ((char *) e + s->sh_offset);
|
|
if (! mod->name)
|
|
--
|
|
2.39.2
|
|
|