Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2026-02-10 21:11:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new.1670 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Tue Feb 10 21:11:56 2026 rev:382 rq:1332137 version:2.14 Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2026-02-02 14:56:11.517048310 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new.1670/grub2.changes 2026-02-10 21:12:02.854620308 +0100 @@ -1,0 +2,10 @@ +Mon Feb 9 03:53:04 UTC 2026 - Michael Chang <[email protected]> + +- Fix screen flickering in BLS due to rendering graphical and text terminals at + the same time (bsc#1256480) +- Add automatic fwsetup menu entry in BLS + * 0001-bls-Allow-configuration-of-active-console-type.patch + * 0002-grubbls-Add-automatic-fwsetup-menu-entry.patch +- Add efifwsetup module to EFI BLS image + +------------------------------------------------------------------- New: ---- 0001-bls-Allow-configuration-of-active-console-type.patch 0002-grubbls-Add-automatic-fwsetup-menu-entry.patch ----------(New B)---------- New:- Add automatic fwsetup menu entry in BLS * 0001-bls-Allow-configuration-of-active-console-type.patch * 0002-grubbls-Add-automatic-fwsetup-menu-entry.patch New: * 0001-bls-Allow-configuration-of-active-console-type.patch * 0002-grubbls-Add-automatic-fwsetup-menu-entry.patch - Add efifwsetup module to EFI BLS image ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.Notwmp/_old 2026-02-10 21:12:06.538774682 +0100 +++ /var/tmp/diff_new_pack.Notwmp/_new 2026-02-10 21:12:06.542774850 +0100 @@ -395,6 +395,8 @@ Patch406: 0001-Revert-configure-Print-a-more-helpful-error-if-autoc.patch Patch407: 0002-Revert-configure-Check-linker-for-image-base-support.patch Patch408: 0001-blsuki-Fix-linux_cmd-size-calcution-in-bls_get_linux.patch +Patch409: 0001-bls-Allow-configuration-of-active-console-type.patch +Patch410: 0002-grubbls-Add-automatic-fwsetup-menu-entry.patch %if 0%{?suse_version} < 1600 Requires: gettext-runtime @@ -885,7 +887,7 @@ %{?sbat_generation:--sbat sbat.csv} \ -d grub-core \ all_video boot font gfxmenu gfxterm gzio halt jpeg minicmd normal part_gpt png reboot video \ - fat tpm tss2 tpm2_key_protector memdisk tar squash4 xzio blsuki blsbumpcounter linux bli regexp loadenv test echo true sleep + fat tpm tss2 tpm2_key_protector memdisk tar squash4 xzio blsuki blsbumpcounter linux bli regexp loadenv test echo true sleep efifwsetup %endif %ifarch x86_64 aarch64 ++++++ 0001-bls-Allow-configuration-of-active-console-type.patch ++++++ >From 43637c1261c3e2ac80279fd8ab7837909ad17098 Mon Sep 17 00:00:00 2001 From: Michael Chang <[email protected]> Date: Mon, 17 Nov 2025 21:49:19 +0800 Subject: [PATCH 1/2] bls: Allow configuration of active console type This patch integrates logic to allow users to set the active console terminals within the GRUB Boot Loader Specification (BLS) image, which is currently named grubbls.efi provided by grub2-x86_64-efi-bls package in openSUSE. By default, the output terminal is set to gfxterm to enable graphical display. However, this behavior can be overridden by defining specific GRUB environment variables, which is stored in the grubenv file residing in the EFI System Partition. The function relies on two new environment variables. The first, blscfg_console_type, specifies the desired consoles to be activated, accepting strings such as console (text-based), gfxterm (graphics), and serial. The second variable, blscfg_serial_command, is used to invoke command related to setup serial driver, allowing the user to configure connection parameters like unit number and baud rate. If only serial is specified in blscfg_console_type but blscfg_serial_command is unset, a default serial initialization command will be used. The console configuration is executed early in the boot process via a new function, bls_set_terminal, which processes these environment variables and uses the terminal_input and terminal_output commands to set up the chosen consoles. Additionally, this function ensures that any necessary fonts and themes are loaded if gfxterm is selected for output. For example, a user could set a text-based console by running a command such as: grub2-editenv /boot/efi/EFI/opensuse/grubenv set \ blscfg_console_type=console Different console can also be enabled at the same time: grub2-editenv /boot/efi/EFI/opensuse/grubenv set \ blscfg_console_type="serial gfxterm" To configure a serial console with specific parameters and enable it, the user would run: grub2-editenv /boot/efi/EFI/opensuse/grubenv set \ blscfg_console_type=serial \ blscfg_serial_command="serial --unit=0 --speed=9600" This functionality provides greater flexibility for systems requiring remote access or non-graphical boot environments. Signed-off-by: Michael Chang <[email protected]> --- grub-core/normal/main.c | 222 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c index 7ee76760d..835e486e6 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -152,6 +152,227 @@ read_envblk_from_cmdpath (void) grub_free (envfile); } +struct theme_dirinfo +{ + const char *dev; + const char *name; + int found; + char *fonts[8]; + grub_size_t num_font; +}; + +static int +theme_dir_iter (const char *filename, const struct grub_dirhook_info *info, void *data) +{ + grub_size_t n, *pnum; + char **p; + struct theme_dirinfo *theme_dir = (struct theme_dirinfo *) data; + + if (info->dir) + return 0; + + if (grub_strcmp (filename, "theme.txt") == 0) + { + theme_dir->found = 1; + return 0; + } + + n = grub_strlen (filename); + if (n <= 4) + return 0; + + if (grub_strcmp (filename + n - 4, ".pf2") != 0) + return 0; + + n = sizeof (theme_dir->fonts) / sizeof (*p); + pnum = &theme_dir->num_font; + if (*pnum >= n) + return 0; + + p = theme_dir->fonts + *pnum; + *p = grub_strdup (filename); + if (*p == NULL) + { + grub_print_error (); + return 0; + } + ++*pnum; + + return 0; +} + +static void +bls_set_terminal (const char *type) +{ + grub_device_t dev; + grub_fs_t fs; + struct theme_dirinfo dirinfo; + grub_size_t i; + grub_uint8_t in = 0; + grub_uint8_t out = 0; + char *cmd = NULL; + char *args = NULL; + + enum { + INPUT_CONSOLE_IDX = 0, + INPUT_SERIAL_IDX, + NUM_CONSOLE_INPUT + }; + + enum { + OUTPUT_CONSOLE_IDX = 0, + OUTPUT_GFXTERM_IDX, + OUTPUT_SERIAL_IDX, + NUM_CONSOLE_OUTPUT + }; + + const char *term_input[NUM_CONSOLE_INPUT] = { + [INPUT_CONSOLE_IDX] = "console", + [INPUT_SERIAL_IDX] = "serial" + }; + + const char *term_output[NUM_CONSOLE_OUTPUT] = { + [OUTPUT_CONSOLE_IDX] = "console", + [OUTPUT_GFXTERM_IDX] = "gfxterm", + [OUTPUT_SERIAL_IDX] = "serial" + }; + + if (type == NULL) + type = grub_env_get ("blscfg_console_type"); + + if (type && grub_strstr (type, term_output[OUTPUT_CONSOLE_IDX]) != NULL) + { + out |= 1 << OUTPUT_CONSOLE_IDX; + in |= 1 << INPUT_CONSOLE_IDX; + } + if (type && grub_strstr (type, term_output[OUTPUT_GFXTERM_IDX]) != NULL) + { + out |= 1 << OUTPUT_GFXTERM_IDX; + in |= 1 << INPUT_CONSOLE_IDX; + } + if (type && grub_strstr (type, term_output[OUTPUT_SERIAL_IDX]) != NULL) + { + out |= 1 << OUTPUT_SERIAL_IDX; + in |= 1 << INPUT_SERIAL_IDX; + } + + if (out == 0) + { + out |= 1 << OUTPUT_GFXTERM_IDX; + in |= 1 << INPUT_CONSOLE_IDX; + } + + if (out & 1 << OUTPUT_SERIAL_IDX) + { + const char *serial = grub_env_get ("blscfg_serial_command"); + + if (serial == NULL) + serial = "serial"; + cmd = grub_xasprintf ("%s\n", serial); + if (cmd == NULL) + { + grub_print_error (); + return; + } + grub_parser_execute (cmd); + grub_free (cmd); + } + + for (i = 0; i < NUM_CONSOLE_INPUT; ++i) + { + if (in & (1 << i) && args == NULL) + { + if (args == NULL) + args = grub_strdup (term_input[i]); + else + { + char *t = args; + + args = grub_xasprintf ("%s %s", args, term_input[i]); + grub_free (t); + } + if (args == NULL) + { + grub_print_error (); + return; + } + } + } + + if (args == NULL) + return; + + cmd = grub_xasprintf ("terminal_input %s\n", args); + if (cmd == NULL) + { + grub_free (args); + grub_print_error (); + return; + } + grub_parser_execute (cmd); + grub_free (args); + grub_free (cmd); + + for (cmd = NULL, i = 0; i < NUM_CONSOLE_OUTPUT; ++i) + { + if (out & (1 << i)) + { + if (cmd == NULL) + cmd = grub_xasprintf ("terminal_output %s\n", term_output[i]); + else + { + grub_free (cmd); + cmd = grub_xasprintf ("terminal_output --append %s\n", term_output[i]); + } + if (cmd == NULL) + { + grub_print_error (); + return; + } + grub_parser_execute (cmd); + } + } + + if (cmd != NULL) + grub_free (cmd); + + dirinfo.dev = "memdisk"; + dirinfo.name = "/boot/grub/themes"; + dirinfo.found = 0; + dirinfo.num_font = 0; + dev = grub_device_open (dirinfo.dev); + if (dev == NULL) + return; + + fs = grub_fs_probe (dev); + if (fs == NULL) + { + grub_errno = GRUB_ERR_NONE; + grub_device_close (dev); + return; + } + + fs->fs_dir (dev, dirinfo.name, theme_dir_iter, &dirinfo); + + for (i = 0; i < dirinfo.num_font; ++i) + { + cmd = grub_xasprintf ("loadfont (%s)%s/%s\n", dirinfo.dev, dirinfo.name, dirinfo.fonts[i]); + grub_parser_execute (cmd); + grub_free (cmd); + } + + if (dirinfo.found) + { + cmd = grub_xasprintf ("set theme=(%s)%s/theme.txt\nexport theme\n", dirinfo.dev, dirinfo.name); + grub_parser_execute (cmd); + grub_free (cmd); + } + + for (i = 0; i < dirinfo.num_font; ++i) + grub_free (dirinfo.fonts[i]); + grub_device_close (dev); +} + static grub_menu_t read_blscfg (void) { @@ -166,6 +387,7 @@ read_blscfg (void) grub_env_set_menu (newmenu); } + bls_set_terminal (NULL); grub_parser_execute ((char *)"blscfg\n"); return newmenu; } -- 2.52.0 ++++++ 0002-grubbls-Add-automatic-fwsetup-menu-entry.patch ++++++ >From c46b6368bfb956b30a6604494bec52f6d837540c Mon Sep 17 00:00:00 2001 From: Michael Chang <[email protected]> Date: Thu, 27 Nov 2025 12:14:30 +0800 Subject: [PATCH 2/2] grubbls: Add automatic fwsetup menu entry Similar to the auto-firmware option in loader.conf, this patch adds support for automatically generating the menu entry that allows users to reboot into the firmware interface instead of the OS. The entry is labeled "UEFI Firmware Settings", the same label used in today's GRUB menu. The feature is enabled by default. To disable it, one can set blscfg_auto_firmware=n in the GRUB environment variable. grub2-editenv /boot/efi/EFI/opensuse/grubenv set \ blscfg_auto_firmware=n Signed-off-by: Michael Chang <[email protected]> --- grub-core/commands/efi/efifwsetup.c | 31 ++++++++++++++++++++++++++++- grub-core/normal/main.c | 12 +++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/grub-core/commands/efi/efifwsetup.c b/grub-core/commands/efi/efifwsetup.c index 704f9d352..cdc84ac2b 100644 --- a/grub-core/commands/efi/efifwsetup.c +++ b/grub-core/commands/efi/efifwsetup.c @@ -24,6 +24,7 @@ #include <grub/efi/efi.h> #include <grub/command.h> #include <grub/i18n.h> +#include <grub/normal.h> GRUB_MOD_LICENSE ("GPLv3+"); @@ -65,7 +66,7 @@ grub_cmd_fwsetup (grub_command_t cmd __attribute__ ((unused)), return GRUB_ERR_BUG; } -static grub_command_t cmd = NULL; +static grub_command_t cmd = NULL, cmd_fwsetup_auto = NULL; static grub_efi_boolean_t efifwsetup_is_supported (void) @@ -89,14 +90,42 @@ efifwsetup_is_supported (void) return ret; } +static grub_err_t +grub_cmd_efifwsetup_auto (grub_command_t command __attribute__ ((unused)), + int argc __attribute__ ((unused)), + char **args __attribute__ ((unused))) +{ + const char *argv[] = { "UEFI Firmware Settings" }; + + if (efifwsetup_is_supported () == false) + return GRUB_ERR_NONE; + + grub_normal_add_menu_entry (1, + argv, + NULL, + "uefi-firmware", + NULL, + NULL, + NULL, + "fwsetup\n", + 0, + NULL, + 0); + return GRUB_ERR_NONE; +} + GRUB_MOD_INIT (efifwsetup) { cmd = grub_register_command ("fwsetup", grub_cmd_fwsetup, NULL, N_("Reboot into firmware setup menu.")); + cmd_fwsetup_auto = grub_register_command ("efifwsetup_auto", grub_cmd_efifwsetup_auto, + NULL, N_("Show UEFI fwsetup menu automatically.")); } GRUB_MOD_FINI (efifwsetup) { if (cmd) grub_unregister_command (cmd); + if (cmd_fwsetup_auto != NULL) + grub_unregister_command (cmd_fwsetup_auto); } diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c index 835e486e6..4428827bf 100644 --- a/grub-core/normal/main.c +++ b/grub-core/normal/main.c @@ -373,6 +373,17 @@ bls_set_terminal (const char *type) grub_device_close (dev); } +static void +bls_auto_firmware (void) +{ + const char *val = grub_env_get ("blscfg_auto_firmware"); + + if (val && (val[0] == '0' || val[0] == 'n')) + return; + + grub_parser_execute ((char *) "efifwsetup_auto\n"); +} + static grub_menu_t read_blscfg (void) { @@ -389,6 +400,7 @@ read_blscfg (void) bls_set_terminal (NULL); grub_parser_execute ((char *)"blscfg\n"); + bls_auto_firmware (); return newmenu; } -- 2.52.0
