Accepting request 481722 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/481722
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=159

grub2.spec

@@ -136,7 +136,7 @@ BuildRequires:  update-bootloader-rpm-macros
 %define only_x86_64 %{nil}
 %endif
 
-Version:        2.02~rc1
+Version:        2.02~rc2
 Release:        0
 Summary:        Bootloader with support for Linux, Multiboot and more
 License:        GPL-3.0+
@@ -178,8 +178,9 @@ 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
-Patch29:        grub2-secureboot-chainloader.patch
-Patch34:        grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.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
 Patch38:        grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
@@ -206,7 +207,7 @@ Patch77:        grub2-s390x-08-workaround-part-to-disk.patch
 Patch78:        grub2-commands-introduce-read_file-subcommand.patch
 Patch79:        grub2-efi-chainload-harder.patch
 Patch80:        grub2-emu-4-all.patch
-Patch81:        0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch
+Patch81:        grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch
 # Btrfs snapshot booting related patches
 Patch101:       grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:       grub2-btrfs-02-export-subvolume-envvars.patch
@@ -220,13 +221,13 @@ Patch108:       grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch
 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
@@ -248,6 +249,19 @@ Patch286:       0007-efinet-Setting-network-from-UEFI-device-path.patch
 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
@@ -426,8 +440,9 @@ swap partition while in resuming
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch29 -p1
-%patch34 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
 %patch35 -p1
 %patch37 -p1
 %patch38 -p1
@@ -466,10 +481,10 @@ swap partition while in resuming
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1
+%patch123 -p1
 %patch140 -p1
 %patch141 -p1
 %patch150 -p1
-%patch162 -p1
 %patch163 -p1
 %patch164 -p1
 %patch205 -p1
@@ -488,6 +503,18 @@ swap partition while in resuming
 %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
@@ -598,6 +625,8 @@ CD_MODULES="${CD_MODULES} linux"
 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
@@ -671,7 +700,7 @@ cd ..
 cd build-efi
 make DESTDIR=$RPM_BUILD_ROOT install
 
-install -m 644 grub.efi $RPM_BUILD_ROOT%{_libdir}/%{name}/%{grubefiarch}/.
+install -m 644 grub.efi grub-tpm.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
@@ -685,7 +714,7 @@ ln -sf ../../../%{_libdir}/%{name}/%{grubefiarch}/grub.efi $RPM_BUILD_ROOT%{syse
 
 %ifarch x86_64
 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
-export BRP_PESIGN_FILES="%{_libdir}/%{name}/%{grubefiarch}/grub.efi"
+export BRP_PESIGN_FILES="%{_libdir}/%{name}/%{grubefiarch}/grub.efi %{_libdir}/%{name}/%{grubefiarch}/grub-tpm.efi"
 install -m 444 grub.der $RPM_BUILD_ROOT%{sysefidir}/
 %endif
 %endif
@@ -1075,6 +1104,7 @@ fi
 %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