Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2024-01-05 21:41:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.28375 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Fri Jan 5 21:41:09 2024 rev:311 rq:1136997 version:2.12~rc1
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2023-12-07
19:09:15.744728634 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.28375/grub2.changes 2024-01-05
21:42:16.148157627 +0100
@@ -1,0 +2,8 @@
+Wed Jan 3 10:05:50 UTC 2024 - Michael Chang <mch...@suse.com>
+
+- grub2.spec: Add ofnet to signed grub.elf to support powerpc net boot
+ installation when secure boot is enabled (bsc#1217761)
+- Improved check for disk device when looking for PReP partition
+ * 0004-Introduce-prep_load_env-command.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.UFYL7j/_old 2024-01-05 21:42:18.832255770 +0100
+++ /var/tmp/diff_new_pack.UFYL7j/_new 2024-01-05 21:42:18.832255770 +0100
@@ -1,7 +1,7 @@
#
# spec file for package grub2
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -714,8 +714,8 @@
CD_MODULES="${CD_MODULES} chain efifwsetup efinet read tpm tpm2 memdisk tar
squash4 xzio"
PXE_MODULES="${PXE_MODULES} efinet"
%else
-CD_MODULES="${CD_MODULES} net"
-PXE_MODULES="${PXE_MODULES} net"
+CD_MODULES="${CD_MODULES} net ofnet"
+PXE_MODULES="${PXE_MODULES} net ofnet"
%endif
%ifarch x86_64
@@ -831,7 +831,13 @@
echo "bpart=$bpart"
echo "bpath=$bpath"
-if [ -z "$ENV_FS_UUID" ]; then
+if regexp '^(tftp|http)$' "$bdev"; then
+ if [ -z "$bpath" ]; then
+ echo "network booting via $bdev but firmware didn't provide loaded path
from sever root"
+ bpath="/boot/grub2/powerpc-ieee1275"
+ echo "using bpath=$bpath as fallback path"
+ fi
+elif [ -z "$ENV_FS_UUID" ]; then
echo "Reading vars from ($bdev)"
prep_load_env "($bdev)"
fi
++++++ 0004-Introduce-prep_load_env-command.patch ++++++
--- /var/tmp/diff_new_pack.UFYL7j/_old 2024-01-05 21:42:19.024262791 +0100
+++ /var/tmp/diff_new_pack.UFYL7j/_new 2024-01-05 21:42:19.028262937 +0100
@@ -27,7 +27,7 @@
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
-@@ -2673,3 +2673,9 @@
+@@ -2679,3 +2679,9 @@
common = lib/libtasn1_wrap/tests/Test_strings.c;
common = lib/libtasn1_wrap/wrap_tests.c;
};
@@ -39,7 +39,7 @@
+};
--- /dev/null
+++ b/grub-core/commands/prep_loadenv.c
-@@ -0,0 +1,230 @@
+@@ -0,0 +1,237 @@
+#include <grub/dl.h>
+#include <grub/mm.h>
+#include <grub/file.h>
@@ -210,6 +210,13 @@
+ if (!dev)
+ return grub_errno;
+
++ /* Only needed for disk device */
++ if (!dev->disk)
++ {
++ err = GRUB_ERR_NONE;
++ goto out;
++ }
++
+ ret = grub_partition_iterate (dev->disk, part_hook, prep);
+ if (ret == 1 && *prep)
+ {
