db7cf3a089
Add some fixes for BLS parsing logic and also make 20-grub.install script to query the relative path of the kernel and initramfs images, so BLS can also work when /boot is not a mount point or is a btrfs subvolume. Also pull some build fixes. Resolves: rhbz#1588184 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 4c53f61b1a889c0f55e76a763b05b6686ec613b8 Mon Sep 17 00:00:00 2001
|
|
From: Michael Marineau <michael.marineau@coreos.com>
|
|
Date: Sun, 21 Aug 2016 18:24:58 -0700
|
|
Subject: [PATCH 227/243] tpm: fix warnings when compiling for platforms other
|
|
than pc and efi
|
|
|
|
---
|
|
include/grub/tpm.h | 17 +++++++++++------
|
|
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/include/grub/tpm.h b/include/grub/tpm.h
|
|
index ecb2d09ff5d..972a5edc836 100644
|
|
--- a/include/grub/tpm.h
|
|
+++ b/include/grub/tpm.h
|
|
@@ -75,12 +75,17 @@ grub_err_t grub_tpm_execute(PassThroughToTPM_InputParamBlock *inbuf,
|
|
grub_err_t grub_tpm_log_event(unsigned char *buf, grub_size_t size,
|
|
grub_uint8_t pcr, const char *description);
|
|
#else
|
|
-static inline grub_err_t grub_tpm_execute(PassThroughToTPM_InputParamBlock *inbuf,
|
|
- PassThroughToTPM_OutputParamBlock *outbuf) { return 0; };
|
|
-static inline grub_err_t grub_tpm_log_event(unsigned char *buf,
|
|
- grub_size_t size,
|
|
- grub_uint8_t pcr,
|
|
- const char *description)
|
|
+static inline grub_err_t grub_tpm_execute(
|
|
+ PassThroughToTPM_InputParamBlock *inbuf __attribute__ ((unused)),
|
|
+ PassThroughToTPM_OutputParamBlock *outbuf __attribute__ ((unused)))
|
|
+{
|
|
+ return 0;
|
|
+};
|
|
+static inline grub_err_t grub_tpm_log_event(
|
|
+ unsigned char *buf __attribute__ ((unused)),
|
|
+ grub_size_t size __attribute__ ((unused)),
|
|
+ grub_uint8_t pcr __attribute__ ((unused)),
|
|
+ const char *description __attribute__ ((unused)))
|
|
{
|
|
return 0;
|
|
};
|
|
--
|
|
2.17.1
|
|
|