Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2023-04-20 15:13:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.2023 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Thu Apr 20 15:13:28 2023 rev:292 rq:1080039 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2023-04-13
14:09:59.208034492 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.2023/grub2.changes 2023-04-20
15:13:47.169767710 +0200
@@ -1,0 +2,12 @@
+Tue Apr 18 02:42:23 UTC 2023 - Michael Chang <mch...@suse.com>
+
+- Fix no prep partition error on non-PReP architectures by making the
+ prep_loadenv module exclusive to powerpc_ieee1275 platform (bsc#1210489)
+ * 0004-Introduce-prep_load_env-command.patch
+- Fix the issue of freeing an uninitialized pointer
+ * 0002-prep_loadenv-Fix-regex-for-Open-Firmware-device-spec.patch
+- Rediff
+ * 0005-export-environment-at-start-up.patch
+ * 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 0002-prep_loadenv-Fix-regex-for-Open-Firmware-device-spec.patch ++++++
--- /var/tmp/diff_new_pack.AkAlEi/_old 2023-04-20 15:13:50.337782237 +0200
+++ /var/tmp/diff_new_pack.AkAlEi/_new 2023-04-20 15:13:50.341782254 +0200
@@ -20,13 +20,14 @@
handle the encoded comma in the Open Firmware device specifier, ensuring
that the correct boot device is identified and used.
+v2:
+Fix the issue of freeing an uninitialized pointer in early_prep_loadenv.
+
Signed-off-by: Michael Chang <mch...@suse.com>
---
grub-core/commands/prep_loadenv.c | 108 ++++++++++++++++++++++--------
1 file changed, 79 insertions(+), 29 deletions(-)
-diff --git a/grub-core/commands/prep_loadenv.c
b/grub-core/commands/prep_loadenv.c
-index de1b95689..c9797c50a 100644
--- a/grub-core/commands/prep_loadenv.c
+++ b/grub-core/commands/prep_loadenv.c
@@ -15,7 +15,7 @@
@@ -38,7 +39,7 @@
{
if (match->rm_so != -1)
{
-@@ -185,24 +185,18 @@ prep_partname (const char *devname, char **prep)
+@@ -185,24 +185,18 @@
return err;
}
@@ -67,7 +68,7 @@
if (ret)
goto fail;
-@@ -210,22 +204,11 @@ boot_disk_prep_partname (char **name)
+@@ -210,22 +204,11 @@
if (! matches)
goto fail;
@@ -94,7 +95,7 @@
}
fail:
-@@ -235,13 +218,58 @@ boot_disk_prep_partname (char **name)
+@@ -235,13 +218,60 @@
if (!comperr)
{
regfree (®ex);
@@ -117,6 +118,8 @@
+ grub_size_t nmatch;
+ char *devname = NULL;
+
++ *name = NULL;
++
+ if (varname)
+ cmdpath = grub_env_get (varname);
+ else
@@ -155,7 +158,7 @@
}
static grub_err_t
-@@ -274,13 +302,31 @@ grub_cmd_prep_loadenv (grub_command_t cmd __attribute__
((unused)),
+@@ -274,13 +304,31 @@
return GRUB_ERR_NONE;
}
@@ -181,25 +184,23 @@
early_prep_loadenv (void)
{
grub_err_t err;
- char *prep;
+- char *prep;
++ char *prep = NULL;
- err = boot_disk_prep_partname (&prep);
+ err = boot_disk_prep_partname (NULL, &prep);
if (err == GRUB_ERR_NONE && prep)
err = prep_read_envblk (prep);
if (err == GRUB_ERR_BAD_FILE_TYPE || err == GRUB_ERR_FILE_NOT_FOUND)
-@@ -295,6 +341,10 @@ static grub_command_t cmd_prep_load;
- GRUB_MOD_INIT(prep_loadenv)
+@@ -296,6 +344,10 @@
{
early_env_hook = early_prep_loadenv;
-+ cmd_prep_load =
+ cmd_prep_load =
+ grub_register_command("prep_partname", grub_cmd_prep_partname,
+ "VARNAME",
+ N_("Get partition name of PReP."));
- cmd_prep_load =
++ cmd_prep_load =
grub_register_command("prep_load_env", grub_cmd_prep_loadenv,
"DEVICE",
---
-2.39.2
-
+ N_("Load variables from environment block file."));
++++++ 0004-Introduce-prep_load_env-command.patch ++++++
--- /var/tmp/diff_new_pack.AkAlEi/_old 2023-04-20 15:13:50.389782475 +0200
+++ /var/tmp/diff_new_pack.AkAlEi/_new 2023-04-20 15:13:50.393782493 +0200
@@ -15,6 +15,9 @@
To avoid disrupting the boot process with errors, it's important to log
any errors that may occur and always return GRUB_ERR_NONE.
+v3:
+Making the new module powerpc_ieee1275 specific.
+
Signed-off-by: Michael Chang <mch...@suse.com>
---
grub-core/Makefile.core.def | 5 +
@@ -24,7 +27,7 @@
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
-@@ -2624,3 +2624,8 @@
+@@ -2624,3 +2624,9 @@
common = lib/libtasn1_wrap/tests/Test_strings.c;
common = lib/libtasn1_wrap/wrap_tests.c;
};
@@ -32,6 +35,7 @@
+module = {
+ name = prep_loadenv;
+ common = commands/prep_loadenv.c;
++ enable = powerpc_ieee1275;
+};
--- /dev/null
+++ b/grub-core/commands/prep_loadenv.c
++++++ 0005-export-environment-at-start-up.patch ++++++
--- /var/tmp/diff_new_pack.AkAlEi/_old 2023-04-20 15:13:50.433782677 +0200
+++ /var/tmp/diff_new_pack.AkAlEi/_new 2023-04-20 15:13:50.437782694 +0200
@@ -19,12 +19,13 @@
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
-@@ -2617,4 +2617,6 @@
+@@ -2628,5 +2628,7 @@
module = {
name = prep_loadenv;
common = commands/prep_loadenv.c;
+ cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+ cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+ enable = powerpc_ieee1275;
};
--- a/grub-core/commands/prep_loadenv.c
+++ b/grub-core/commands/prep_loadenv.c
++++++ 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch ++++++
--- /var/tmp/diff_new_pack.AkAlEi/_old 2023-04-20 15:13:50.513783043 +0200
+++ /var/tmp/diff_new_pack.AkAlEi/_new 2023-04-20 15:13:50.517783062 +0200
@@ -31,9 +31,9 @@
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
-@@ -2643,3 +2643,8 @@
- cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+@@ -2633,3 +2633,8 @@
cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+ enable = powerpc_ieee1275;
};
+
+module = {
