8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From 54b6ba5f27dd9eb9ec2f1a41e7160964ab94451c Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Wed, 23 Nov 2016 16:52:16 +0800
|
|
Subject: Build tpm as module
|
|
|
|
Add --suse-enable-tpm option to grub2-install.
|
|
|
|
--- a/util/grub-install.c
|
|
+++ b/util/grub-install.c
|
|
@@ -81,6 +81,7 @@
|
|
static char *label_bgcolor;
|
|
static char *product_version;
|
|
static int add_rs_codes = 1;
|
|
+static int suse_enable_tpm = 0;
|
|
|
|
enum
|
|
{
|
|
@@ -107,6 +108,7 @@
|
|
OPTION_DISK_MODULE,
|
|
OPTION_NO_BOOTSECTOR,
|
|
OPTION_NO_RS_CODES,
|
|
+ OPTION_SUSE_ENABLE_TPM,
|
|
OPTION_MACPPC_DIRECTORY,
|
|
OPTION_ZIPL_DIRECTORY,
|
|
OPTION_LABEL_FONT,
|
|
@@ -232,6 +234,10 @@
|
|
add_rs_codes = 0;
|
|
return 0;
|
|
|
|
+ case OPTION_SUSE_ENABLE_TPM:
|
|
+ suse_enable_tpm = 1;
|
|
+ return 0;
|
|
+
|
|
case OPTION_DEBUG:
|
|
verbosity++;
|
|
return 0;
|
|
@@ -293,6 +299,7 @@
|
|
{"no-rs-codes", OPTION_NO_RS_CODES, 0, 0,
|
|
N_("Do not apply any reed-solomon codes when embedding core.img. "
|
|
"This option is only available on x86 BIOS targets."), 0},
|
|
+ {"suse-enable-tpm", OPTION_SUSE_ENABLE_TPM, 0, 0, N_("install TPM modules"), 0},
|
|
|
|
{"debug", OPTION_DEBUG, 0, OPTION_HIDDEN, 0, 2},
|
|
{"no-floppy", OPTION_NO_FLOPPY, 0, OPTION_HIDDEN, 0, 2},
|
|
@@ -1373,6 +1380,9 @@
|
|
else if (disk_module && disk_module[0])
|
|
grub_install_push_module (disk_module);
|
|
|
|
+ if (suse_enable_tpm && platform == GRUB_INSTALL_PLATFORM_X86_64_EFI)
|
|
+ grub_install_push_module ("tpm");
|
|
+
|
|
relative_grubdir = grub_make_system_path_relative_to_its_root (grubdir);
|
|
if (relative_grubdir[0] == '\0')
|
|
{
|