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-01-04 17:51:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Wed Jan 4 17:51:04 2023 rev:279 rq:1046400 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2022-12-20
20:20:10.337774765 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.1563/grub2.changes 2023-01-04
17:51:23.905755719 +0100
@@ -1,0 +2,20 @@
+Fri Dec 30 07:58:54 UTC 2022 - Michael Chang <mch...@suse.com>
+
+- Fix inappropriately including commented lines in crypttab (bsc#1206279)
+ * 0010-templates-import-etc-crypttab-to-grub.cfg.patch
+
+-------------------------------------------------------------------
+Fri Dec 23 09:50:42 UTC 2022 - Michael Chang <mch...@suse.com>
+
+- Make grub.cfg invariant to efi and legacy platforms (bsc#1205200)
+- Removed patch linuxefi
+ * grub2-secureboot-provide-linuxefi-config.patch
+ * grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
+ * grub2-secureboot-use-linuxefi-on-uefi.patch
+- Rediff
+ * grub2-btrfs-05-grub2-mkconfig.patch
+ * grub2-efi-xen-cmdline.patch
+ * grub2-s390x-05-grub2-mkconfig.patch
+ * grub2-suse-remove-linux-root-param.patch
+
+-------------------------------------------------------------------
Old:
----
grub2-secureboot-provide-linuxefi-config.patch
grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
grub2-secureboot-use-linuxefi-on-uefi.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.tSAz94/_old 2023-01-04 17:51:26.385770337 +0100
+++ /var/tmp/diff_new_pack.tSAz94/_new 2023-01-04 17:51:26.389770360 +0100
@@ -193,11 +193,8 @@
Patch17: grub2-pass-corret-root-for-nfsroot.patch
Patch19: grub2-efi-HP-workaround.patch
Patch21: grub2-secureboot-add-linuxefi.patch
-Patch22: grub2-secureboot-use-linuxefi-on-uefi.patch
Patch23: grub2-secureboot-no-insmod-on-sb.patch
-Patch24: grub2-secureboot-provide-linuxefi-config.patch
Patch25: grub2-secureboot-chainloader.patch
-Patch26: grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
Patch27: grub2-linuxefi-fix-boot-params.patch
Patch35: grub2-linguas.sh-no-rsync.patch
Patch37: grub2-use-Unifont-for-starfield-theme-terminal.patch
++++++ 0010-templates-import-etc-crypttab-to-grub.cfg.patch ++++++
--- /var/tmp/diff_new_pack.tSAz94/_old 2023-01-04 17:51:26.717772293 +0100
+++ /var/tmp/diff_new_pack.tSAz94/_new 2023-01-04 17:51:26.721772317 +0100
@@ -18,7 +18,7 @@
--- a/Makefile.util.def
+++ b/Makefile.util.def
-@@ -477,6 +477,13 @@
+@@ -476,6 +476,13 @@
};
script = {
@@ -67,7 +67,7 @@
+
+if [ -r "$CRYPTTAB" ]; then
+ awk '
-+ $3 ~ /(^\/dev\/|^\/proc\/|^\/sys\/|:)/ { next }
++ /^\s*#/ || $3 ~ /(^\/dev\/|^\/proc\/|^\/sys\/|:)/ { next }
+ { key[0] = $3 }
+ $3 ~ /(^$|none|-)/ {
+ key[0] = "/etc/cryptsetup-keys.d/" $1 ".key"
++++++ grub2-btrfs-05-grub2-mkconfig.patch ++++++
--- /var/tmp/diff_new_pack.tSAz94/_old 2023-01-04 17:51:26.961773731 +0100
+++ /var/tmp/diff_new_pack.tSAz94/_new 2023-01-04 17:51:26.965773755 +0100
@@ -6,11 +6,9 @@
util/grub.d/20_linux_xen.in | 4 ++++
5 files changed, 42 insertions(+), 3 deletions(-)
-Index: grub-2.02~beta2/util/grub-mkconfig_lib.in
-===================================================================
---- grub-2.02~beta2.orig/util/grub-mkconfig_lib.in
-+++ grub-2.02~beta2/util/grub-mkconfig_lib.in
-@@ -49,7 +49,11 @@ grub_warn ()
+--- a/util/grub-mkconfig_lib.in
++++ b/util/grub-mkconfig_lib.in
+@@ -49,7 +49,11 @@
make_system_path_relative_to_its_root ()
{
@@ -22,11 +20,9 @@
}
is_path_readable_by_grub ()
-Index: grub-2.02~beta2/util/grub.d/00_header.in
-===================================================================
---- grub-2.02~beta2.orig/util/grub.d/00_header.in
-+++ grub-2.02~beta2/util/grub.d/00_header.in
-@@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -27,6 +27,14 @@
. "$pkgdatadir/grub-mkconfig_lib"
@@ -41,7 +37,7 @@
# Do this as early as possible, since other commands might depend on it.
# (e.g. the `loadfont' command might need lvm or raid modules)
for i in ${GRUB_PRELOAD_MODULES} ; do
-@@ -43,7 +51,9 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved
+@@ -43,7 +51,9 @@
if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then
GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
cat << EOF
@@ -52,7 +48,7 @@
load_env
fi
-@@ -367,3 +377,15 @@ fi
+@@ -401,3 +411,15 @@
if [ "x${GRUB_BADRAM}" != "x" ] ; then
echo "badram ${GRUB_BADRAM}"
fi
@@ -68,25 +64,21 @@
+fi
+EOF
+fi
-Index: grub-2.02~beta2/util/grub-mkconfig.in
-===================================================================
---- grub-2.02~beta2.orig/util/grub-mkconfig.in
-+++ grub-2.02~beta2/util/grub-mkconfig.in
-@@ -262,7 +262,8 @@ export GRUB_DEFAULT \
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -294,7 +294,8 @@
+ GRUB_BADRAM \
GRUB_OS_PROBER_SKIP_LIST \
GRUB_DISABLE_SUBMENU \
- GRUB_CMDLINE_LINUX_RECOVERY \
-- GRUB_USE_LINUXEFI
-+ GRUB_USE_LINUXEFI \
+- GRUB_CMDLINE_LINUX_RECOVERY
++ GRUB_CMDLINE_LINUX_RECOVERY \
+ SUSE_BTRFS_SNAPSHOT_BOOTING
if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new"
-Index: grub-2.02~beta2/util/grub.d/10_linux.in
-===================================================================
---- grub-2.02~beta2.orig/util/grub.d/10_linux.in
-+++ grub-2.02~beta2/util/grub.d/10_linux.in
-@@ -57,10 +57,14 @@ fi
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -69,10 +69,14 @@
case x"$GRUB_FS" in
xbtrfs)
@@ -101,7 +93,7 @@
fi;;
xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label
2>/dev/null || true`
-@@ -236,7 +240,12 @@ while [ "x$list" != "x" ] ; do
+@@ -239,7 +243,12 @@
if [ $PLATFORM != "emu" ]; then
hotkey=0
else
@@ -115,11 +107,9 @@
fi
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
alt_version=`echo $version | sed -e "s,\.old$,,g"`
-Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
-===================================================================
---- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in
-+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
-@@ -71,10 +71,14 @@ fi
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -79,10 +79,14 @@
case x"$GRUB_FS" in
xbtrfs)
++++++ grub2-efi-xen-cmdline.patch ++++++
--- /var/tmp/diff_new_pack.tSAz94/_old 2023-01-04 17:51:27.025774109 +0100
+++ /var/tmp/diff_new_pack.tSAz94/_new 2023-01-04 17:51:27.029774132 +0100
@@ -1,22 +1,18 @@
-Index: grub-2.02~beta2/util/grub-mkconfig.in
-===================================================================
---- grub-2.02~beta2.orig/util/grub-mkconfig.in
-+++ grub-2.02~beta2/util/grub-mkconfig.in
-@@ -260,7 +260,8 @@ export GRUB_DEFAULT \
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -295,7 +295,8 @@
+ GRUB_OS_PROBER_SKIP_LIST \
GRUB_DISABLE_SUBMENU \
GRUB_CMDLINE_LINUX_RECOVERY \
- GRUB_USE_LINUXEFI \
- SUSE_BTRFS_SNAPSHOT_BOOTING
+ SUSE_BTRFS_SNAPSHOT_BOOTING \
+ SUSE_CMDLINE_XENEFI
if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new"
-Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
-===================================================================
---- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in
-+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
-@@ -176,7 +176,7 @@ linux_entry ()
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -216,7 +216,7 @@
message="$(gettext_printf "Loading Xen %s with Linux %s ..."
${xen_version} ${version})"
sed "s/^/$submenu_indentation/" <<-EOF
echo '$(echo "$message" | grub_quote)'
++++++ grub2-s390x-05-grub2-mkconfig.patch ++++++
--- /var/tmp/diff_new_pack.tSAz94/_old 2023-01-04 17:51:27.149774839 +0100
+++ /var/tmp/diff_new_pack.tSAz94/_new 2023-01-04 17:51:27.153774863 +0100
@@ -14,11 +14,9 @@
util/grub.d/10_linux.in | 63
++++++++++++++++++++++++++++++++++++++----------
1 file changed, 51 insertions(+), 12 deletions(-)
-Index: grub-2.02~beta2/util/grub.d/10_linux.in
-===================================================================
---- grub-2.02~beta2.orig/util/grub.d/10_linux.in
-+++ grub-2.02~beta2/util/grub.d/10_linux.in
-@@ -51,6 +51,10 @@ else
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -63,6 +63,10 @@
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
fi
@@ -29,7 +27,7 @@
case x"$GRUB_FS" in
xbtrfs)
rootsubvol="`make_system_path_relative_to_its_root /`"
-@@ -67,6 +71,21 @@ esac
+@@ -79,6 +83,21 @@
title_correction_code=
@@ -51,7 +49,7 @@
linux_entry ()
{
os="$1"
-@@ -96,9 +115,11 @@ linux_entry ()
+@@ -108,9 +127,11 @@
title_correction_code="${title_correction_code}if [ \"x\$default\" =
'$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
grub_warn "$(gettext_printf "Please don't use old title \`%s' for
GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or
later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title"
"gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
fi
@@ -65,7 +63,7 @@
fi
if [ x$type != xrecovery ] ; then
save_default_entry | grub_add_tab
-@@ -121,6 +142,7 @@ linux_entry ()
+@@ -133,6 +154,7 @@
echo " insmod gzio" | sed "s/^/$submenu_indentation/"
@@ -73,15 +71,15 @@
if [ x$dirname = x/ ]; then
if [ -z "${prepare_root_cache}" ]; then
prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} |
grub_add_tab)"
-@@ -132,6 +154,7 @@ linux_entry ()
+@@ -144,6 +166,7 @@
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
fi
+ fi
message="$(gettext_printf "Loading Linux %s ..." ${version})"
- if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then
- sed "s/^/$submenu_indentation/" << EOF
-@@ -166,17 +189,15 @@ EOF
+ sed "s/^/$submenu_indentation/" << EOF
+ echo '$(echo "$message" | grub_quote)'
+@@ -168,17 +191,15 @@
machine=`uname -m`
case "x$machine" in
@@ -107,7 +105,7 @@
case "$machine" in
i?86) GENKERNEL_ARCH="x86" ;;
-@@ -186,6 +207,15 @@ case "$machine" in
+@@ -188,6 +209,15 @@
*) GENKERNEL_ARCH="$machine" ;;
esac
@@ -123,7 +121,7 @@
prepare_boot_cache=
prepare_root_cache=
boot_device_id=
-@@ -202,6 +232,11 @@ while [ "x$list" != "x" ] ; do
+@@ -204,6 +234,11 @@
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -135,7 +133,7 @@
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-@@ -286,7 +321,8 @@ while [ "x$list" != "x" ] ; do
+@@ -319,7 +354,8 @@
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
fi
# TRANSLATORS: %s is replaced with an OS name
++++++ grub2-suse-remove-linux-root-param.patch ++++++
--- /var/tmp/diff_new_pack.tSAz94/_old 2023-01-04 17:51:27.217775241 +0100
+++ /var/tmp/diff_new_pack.tSAz94/_new 2023-01-04 17:51:27.221775264 +0100
@@ -1,10 +1,8 @@
-Index: grub-2.02/util/grub-mkconfig.in
-===================================================================
---- grub-2.02.orig/util/grub-mkconfig.in
-+++ grub-2.02/util/grub-mkconfig.in
-@@ -268,7 +268,8 @@ export GRUB_DEFAULT \
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -296,7 +296,8 @@
+ GRUB_DISABLE_SUBMENU \
GRUB_CMDLINE_LINUX_RECOVERY \
- GRUB_USE_LINUXEFI \
SUSE_BTRFS_SNAPSHOT_BOOTING \
- SUSE_CMDLINE_XENEFI
+ SUSE_CMDLINE_XENEFI \
@@ -12,11 +10,9 @@
if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new"
-Index: grub-2.02/util/grub.d/10_linux.in
-===================================================================
---- grub-2.02.orig/util/grub.d/10_linux.in
-+++ grub-2.02/util/grub.d/10_linux.in
-@@ -64,7 +64,7 @@ case x"$GRUB_FS" in
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -74,7 +74,7 @@
else
rootsubvol="`make_system_path_relative_to_its_root /`"
rootsubvol="${rootsubvol#/}"
@@ -25,7 +21,7 @@
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol}
${GRUB_CMDLINE_LINUX}"
fi
fi;;
-@@ -75,6 +75,10 @@ case x"$GRUB_FS" in
+@@ -85,6 +85,10 @@
;;
esac
@@ -36,11 +32,9 @@
title_correction_code=
hotkey=1
-Index: grub-2.02/util/grub.d/20_linux_xen.in
-===================================================================
---- grub-2.02.orig/util/grub.d/20_linux_xen.in
-+++ grub-2.02/util/grub.d/20_linux_xen.in
-@@ -78,7 +78,7 @@ case x"$GRUB_FS" in
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -98,7 +98,7 @@
else
rootsubvol="`make_system_path_relative_to_its_root /`"
rootsubvol="${rootsubvol#/}"
@@ -49,7 +43,7 @@
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol}
${GRUB_CMDLINE_LINUX}"
fi
fi;;
-@@ -89,6 +89,10 @@ case x"$GRUB_FS" in
+@@ -109,6 +109,10 @@
;;
esac
@@ -60,11 +54,9 @@
title_correction_code=
grub2_unquote ()
-Index: grub-2.02/util/s390x/zipl2grub.pl.in
-===================================================================
---- grub-2.02.orig/util/s390x/zipl2grub.pl.in
-+++ grub-2.02/util/s390x/zipl2grub.pl.in
-@@ -367,9 +367,13 @@ while ( <IN> ) {
+--- a/util/s390x/zipl2grub.pl.in
++++ b/util/s390x/zipl2grub.pl.in
+@@ -384,9 +384,13 @@
} else {
$v = "";
}
