Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2017-03-14 09:54:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Tue Mar 14 09:54:35 2017 rev:158 rq: version:2.02~rc1
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2017-03-11
15:18:49.514446142 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-03-14
09:54:36.845758487 +0100
@@ -2,30 +1,0 @@
-Mon Mar 6 06:34:01 UTC 2017 - mch...@suse.com
-
-- TPM Support (FATE#315831)
- * 0001-tpm-Core-TPM-support.patch
- * 0002-tpm-Measure-kernel-initrd.patch
- * 0003-tpm-Add-BIOS-boot-measurement.patch
- * 0004-tpm-Rework-linux-command.patch
- * 0005-tpm-Rework-linux16-command.patch
- * 0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
- * 0007-tpm-Measure-the-kernel-commandline.patch
- * 0008-tpm-Measure-commands.patch
- * 0009-tpm-Measure-multiboot-images-and-modules.patch
- * 0010-tpm-Fix-boot-when-there-s-no-TPM.patch
- * 0011-tpm-Fix-build-error.patch
- * 0012-tpm-Build-tpm-as-module.patch
-- grub2.spec : Add grub-tpm.efi for Secure Boot
-
--------------------------------------------------------------------
-Fri Mar 3 10:26:10 UTC 2017 - mch...@suse.com
-
-- Fix invalid Xen EFI config files if xen_args include GRUB2 quoting
- (bsc#900418) (bsc#951748)
- * grub2-efi-xen-cfg-unquote.patch
-- Fix linuxefi erroneously initialize linux's boot_params with non-zero
- values. (bsc#1025563)
- * grub2-linuxefi-fix-boot-params.patch
-- Removed grub2-fix-multi-device-root-kernel-argument.patch as it has
- regression on how GRUB_DISABLE_LINUX_UUID=true interpreted (bsc#1015138)
-
--------------------------------------------------------------------
Old:
----
0001-tpm-Core-TPM-support.patch
0002-tpm-Measure-kernel-initrd.patch
0003-tpm-Add-BIOS-boot-measurement.patch
0004-tpm-Rework-linux-command.patch
0005-tpm-Rework-linux16-command.patch
0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
0007-tpm-Measure-the-kernel-commandline.patch
0008-tpm-Measure-commands.patch
0009-tpm-Measure-multiboot-images-and-modules.patch
0010-tpm-Fix-boot-when-there-s-no-TPM.patch
0011-tpm-Fix-build-error.patch
0012-tpm-Build-tpm-as-module.patch
grub2-efi-xen-cfg-unquote.patch
grub2-linuxefi-fix-boot-params.patch
New:
----
grub2-fix-multi-device-root-kernel-argument.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.pjVSyf/_old 2017-03-14 09:54:38.877470802 +0100
+++ /var/tmp/diff_new_pack.pjVSyf/_new 2017-03-14 09:54:38.881470235 +0100
@@ -1,7 +1,7 @@
#
# spec file for package grub2
#
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -178,9 +178,8 @@
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
+Patch29: grub2-secureboot-chainloader.patch
+Patch34: grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
Patch35: grub2-linguas.sh-no-rsync.patch
Patch37: grub2-use-Unifont-for-starfield-theme-terminal.patch
Patch38:
grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
@@ -221,13 +220,13 @@
Patch120: grub2-efi-xen-chainload.patch
Patch121: grub2-efi-chainloader-root.patch
Patch122: grub2-efi-xen-cmdline.patch
-Patch123: grub2-efi-xen-cfg-unquote.patch
# Hidden menu entry and hotkey "t" for text console
Patch140: grub2-Add-hidden-menu-entries.patch
Patch141: grub2-SUSE-Add-the-t-hotkey.patch
# EFI free memory on exit fix (bsc#980739)
Patch150: grub2-efi-Free-malloc-regions-on-exit.patch
# Linux root device related patches
+Patch162: grub2-fix-multi-device-root-kernel-argument.patch
Patch163: grub2-zipl-setup-fix-btrfs-multipledev.patch
Patch164: grub2-suse-remove-linux-root-param.patch
# PPC64 LE support
@@ -249,19 +248,6 @@
Patch287: 0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch
# Fix GOP BLT support (FATE#322332)
Patch311: grub2-efi-gop-add-blt.patch
-# TPM Support (FATE#315831)
-Patch400: 0001-tpm-Core-TPM-support.patch
-Patch401: 0002-tpm-Measure-kernel-initrd.patch
-Patch402: 0003-tpm-Add-BIOS-boot-measurement.patch
-Patch403: 0004-tpm-Rework-linux-command.patch
-Patch404: 0005-tpm-Rework-linux16-command.patch
-Patch405: 0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
-Patch406: 0007-tpm-Measure-the-kernel-commandline.patch
-Patch407: 0008-tpm-Measure-commands.patch
-Patch408: 0009-tpm-Measure-multiboot-images-and-modules.patch
-Patch409: 0010-tpm-Fix-boot-when-there-s-no-TPM.patch
-Patch410: 0011-tpm-Fix-build-error.patch
-Patch411: 0012-tpm-Build-tpm-as-module.patch
Requires: gettext-runtime
%if 0%{?suse_version} >= 1140
@@ -351,9 +337,9 @@
%package %{grubefiarch}
Summary: Bootloader with support for Linux, Multiboot and more
-Group: System/Boot
# Require efibootmgr
# Without it grub-install is broken so break the package as well if unavailable
+Group: System/Boot
Requires: efibootmgr
Requires(post): efibootmgr
Requires: %{name} = %{version}-%{release}
@@ -440,9 +426,8 @@
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
+%patch29 -p1
+%patch34 -p1
%patch35 -p1
%patch37 -p1
%patch38 -p1
@@ -481,10 +466,10 @@
%patch120 -p1
%patch121 -p1
%patch122 -p1
-%patch123 -p1
%patch140 -p1
%patch141 -p1
%patch150 -p1
+%patch162 -p1
%patch163 -p1
%patch164 -p1
%patch205 -p1
@@ -503,18 +488,6 @@
%patch286 -p1
%patch287 -p1
%patch311 -p1
-%patch400 -p1
-%patch401 -p1
-%patch402 -p1
-%patch403 -p1
-%patch404 -p1
-%patch405 -p1
-%patch406 -p1
-%patch407 -p1
-%patch408 -p1
-%patch409 -p1
-%patch410 -p1
-%patch411 -p1
# This simplifies patch handling without need to use git to create patch
# that renames file
@@ -625,8 +598,6 @@
GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES}
mdraid09 mdraid1x lvm serial"
./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \
-d grub-core ${GRUB_MODULES}
-./grub-mkimage -O %{grubefiarch} -o grub-tpm.efi --prefix= \
- -d grub-core ${GRUB_MODULES} tpm
#./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus
fat \
# ext2 btrfs normal chain boot configfile linux appleldr minicmd \
# loadbios reboot halt search font gfxterm
@@ -700,7 +671,7 @@
cd build-efi
make DESTDIR=$RPM_BUILD_ROOT install
-install -m 644 grub.efi grub-tpm.efi
$RPM_BUILD_ROOT%{_libdir}/%{name}/%{grubefiarch}/.
+install -m 644 grub.efi $RPM_BUILD_ROOT%{_libdir}/%{name}/%{grubefiarch}/.
# Create grub.efi link to system efi directory
# This is for tools like kiwi not fiddling with the path
@@ -714,7 +685,7 @@
%ifarch x86_64
%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
-export BRP_PESIGN_FILES="%{_libdir}/%{name}/%{grubefiarch}/grub.efi
%{_libdir}/%{name}/%{grubefiarch}/grub-tpm.efi"
+export BRP_PESIGN_FILES="%{_libdir}/%{name}/%{grubefiarch}/grub.efi"
install -m 444 grub.der $RPM_BUILD_ROOT%{sysefidir}/
%endif
%endif
@@ -1104,7 +1075,6 @@
%defattr(-,root,root,-)
%dir %{_libdir}/%{name}/%{grubefiarch}
%{_libdir}/%{name}/%{grubefiarch}/grub.efi
-%{_libdir}/%{name}/%{grubefiarch}/grub-tpm.efi
%{_libdir}/%{name}/%{grubefiarch}/*.img
%{_libdir}/%{name}/%{grubefiarch}/*.lst
%{_libdir}/%{name}/%{grubefiarch}/*.mod
++++++ grub2-fix-multi-device-root-kernel-argument.patch ++++++
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
@@ -45,12 +45,14 @@ esac
# btrfs may reside on multiple devices. We cannot pass them as value of root=
parameter
# and mounting btrfs requires user space scanning, so force UUID in this case.
-if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" =
"xtrue" ] \
+if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" =
"xtrue" ] \
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
- || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm );
then
+ || uses_abstraction "${GRUB_DEVICE}" lvm ) && test -e "${GRUB_DEVICE}";
then
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
else
- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+ if [ "x${GRUB_DEVICE_UUID}" != "x" ]; then
+ LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+ fi
fi
if [ "x$GRUB_CONMODE" != "x" ]; then
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
@@ -55,12 +55,14 @@ esac
# btrfs may reside on multiple devices. We cannot pass them as value of root=
parameter
# and mounting btrfs requires user space scanning, so force UUID in this case.
-if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" =
"xtrue" ] \
+if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" =
"xtrue" ] \
|| ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
- || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm );
then
+ || uses_abstraction "${GRUB_DEVICE}" lvm ) && test -e "${GRUB_DEVICE}";
then
LINUX_ROOT_DEVICE=${GRUB_DEVICE}
else
- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+ if [ "x${GRUB_DEVICE_UUID}" != "x" ]; then
+ LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+ fi
fi
# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT.
