mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-28 15:46:53 +00:00
Fix ppc64 build failure on fedora-24
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
parent
af00b6d03c
commit
8768d236a0
20 changed files with 55 additions and 21 deletions
|
@ -1,4 +1,4 @@
|
|||
From 93653ab62a8c139654fc798fc4c7d74db267b2ee Mon Sep 17 00:00:00 2001
|
||||
From f14de1eb2cbd8aa451a231c9000f157a6e29b093 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 6 Oct 2015 16:09:25 -0400
|
||||
Subject: [PATCH 70/88] Make any of the loaders that link in efi mode honor
|
||||
|
@ -24,9 +24,11 @@ Signed-off-by: Peter Jones <pjones@redhat.com>
|
|||
grub-core/loader/xnu.c | 7 +++++
|
||||
include/grub/efi/efi.h | 1 -
|
||||
include/grub/efi/sb.h | 29 +++++++++++++++++++
|
||||
15 files changed, 146 insertions(+), 29 deletions(-)
|
||||
include/grub/powerpc/linux.h | 23 +++++++++++++++
|
||||
16 files changed, 169 insertions(+), 29 deletions(-)
|
||||
create mode 100644 grub-core/kern/efi/sb.c
|
||||
create mode 100644 include/grub/efi/sb.h
|
||||
create mode 100644 include/grub/powerpc/linux.h
|
||||
|
||||
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
|
||||
index 04e9395..fd715a8 100644
|
||||
|
@ -469,6 +471,35 @@ index 0000000..9629fbb
|
|||
+int EXPORT_FUNC (grub_efi_secure_boot) (void);
|
||||
+
|
||||
+#endif /* ! GRUB_EFI_SB_HEADER */
|
||||
diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
|
||||
new file mode 100644
|
||||
index 0000000..6cecb2e
|
||||
--- /dev/null
|
||||
+++ b/include/grub/powerpc/linux.h
|
||||
@@ -0,0 +1,23 @@
|
||||
+/* linux.h - PowerPC linux specific definitions */
|
||||
+/*
|
||||
+ * GRUB -- GRand Unified Bootloader
|
||||
+ * Copyright (C) 2013 Free Software Foundation, Inc.
|
||||
+ *
|
||||
+ * GRUB is free software: you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License as published by
|
||||
+ * the Free Software Foundation, either version 3 of the License, or
|
||||
+ * (at your option) any later version.
|
||||
+ *
|
||||
+ * GRUB is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License
|
||||
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+#ifndef GRUB_LINUX_CPU_HEADER
|
||||
+#define GRUB_LINUX_CPU_HEADER 1
|
||||
+
|
||||
+#endif /* ! GRUB_LINUX_CPU_HEADER */
|
||||
--
|
||||
2.5.5
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 115128428dfd5552605152180ebe227d4b1e7b4e Mon Sep 17 00:00:00 2001
|
||||
From a350e596100ebdea5f698f81a58332118aee9841 Mon Sep 17 00:00:00 2001
|
||||
From: Hector Marco-Gisbert <hecmargi@upv.es>
|
||||
Date: Fri, 13 Nov 2015 16:21:09 +0100
|
||||
Subject: [PATCH 71/88] Fix security issue when reading username and password
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 2a3ab6ddcff1015e9c6df6a1f61779d581e9a26d Mon Sep 17 00:00:00 2001
|
||||
From 8deb795073874f4f2153a6e26bfe3fb8dd03a301 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Fri, 4 Dec 2015 09:28:38 -0500
|
||||
Subject: [PATCH 72/88] 01_users: Handle GRUB_PASSWORD better.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 4fa25a258abddce2c1c8a27decc4b9f554f731b8 Mon Sep 17 00:00:00 2001
|
||||
From 5517beacf74d58f5f80b0ca8b9b739ef4594930d Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Tue, 14 Jul 2015 17:06:35 -0700
|
||||
Subject: [PATCH 73/88] Core TPM support
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From d24a5cf53175a3498b9c67a97ca6ad5604d0a678 Mon Sep 17 00:00:00 2001
|
||||
From ef38c89ec0a5898df9e9d50707baa3e705d60921 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Thu, 16 Jul 2015 15:22:34 -0700
|
||||
Subject: [PATCH 74/88] Measure kernel + initrd
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 69b26d3068903f543e0a7ba949c76d63467b10d5 Mon Sep 17 00:00:00 2001
|
||||
From 4990275dd9084a0ad3e544a5ca841b8cd0e06254 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Sun, 9 Aug 2015 15:48:51 -0700
|
||||
Subject: [PATCH 75/88] Add BIOS boot measurement
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 47beae47e49806881000c479a5912d3bf2990da4 Mon Sep 17 00:00:00 2001
|
||||
From 7774b9780271782da56834b49f4f4ffd8e5b40c4 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Sun, 9 Aug 2015 16:12:39 -0700
|
||||
Subject: [PATCH 76/88] Rework linux command
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 4cd88ca039d62e64ee4ccbe46a4ea3500a70a6be Mon Sep 17 00:00:00 2001
|
||||
From a696b8eb6ea6e5a2a17b697f8b8f9ed0a57a0a96 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Sun, 9 Aug 2015 16:20:58 -0700
|
||||
Subject: [PATCH 77/88] Rework linux16 command
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 05f686df4b9a012035854b082bb4c3b7c745da28 Mon Sep 17 00:00:00 2001
|
||||
From 443457897a9b415e6b7f7f41e93f78947b15d206 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Sun, 9 Aug 2015 16:28:29 -0700
|
||||
Subject: [PATCH 78/88] Measure kernel and initrd on BIOS systems
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 2ab937cba72f43241667db08b5e36cd31a77f331 Mon Sep 17 00:00:00 2001
|
||||
From 484cfd345f144e98639816de5c28696a1085f06f Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Sun, 9 Aug 2015 16:32:29 -0700
|
||||
Subject: [PATCH 79/88] Measure the kernel commandline
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From e3aae28751e0f0128d877ed25b28d4d2f875b71a Mon Sep 17 00:00:00 2001
|
||||
From e6dbf1fb12a951b9d3c3e19b80852ce6c53b516c Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@srcf.ucam.org>
|
||||
Date: Mon, 10 Aug 2015 15:27:12 -0700
|
||||
Subject: [PATCH 80/88] Measure commands
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From ee0acf80b073cf652a949673bd750e7a9a302d37 Mon Sep 17 00:00:00 2001
|
||||
From cdcff708c76890986b9e3ae9be084da6b152adde Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Tue, 1 Sep 2015 16:02:55 -0700
|
||||
Subject: [PATCH 81/88] Measure multiboot images and modules
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 1c4338a7d3921e18364c696c679e77e23e7193b3 Mon Sep 17 00:00:00 2001
|
||||
From 0b2a179c9e1da39556fffd6a70ced539e41652e5 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Fri, 4 Mar 2016 16:29:13 -0500
|
||||
Subject: [PATCH 82/88] Make grub-editenv build again.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From d477086463fd9ea61a3df4b55a4adde56c386215 Mon Sep 17 00:00:00 2001
|
||||
From ee96c8d2dc827a1a4016bc9641d01b95c82155dd Mon Sep 17 00:00:00 2001
|
||||
From: Robert Marshall <rmarshall@redhat.com>
|
||||
Date: Fri, 29 Jan 2016 17:34:02 -0500
|
||||
Subject: [PATCH 83/88] Fix locale issue in grub-setpassword (#1294243)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From b4e66576c9fd1602aeb924b13cdc39d8c59a4255 Mon Sep 17 00:00:00 2001
|
||||
From 30a9147b7c93cbfd673fb0811d2e0f22b98cc498 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 23 Sep 2014 09:58:49 -0400
|
||||
Subject: [PATCH 84/88] Fix up some man pages rpmdiff noticed.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 54d0f8d24fc634b71e8525703a6eea8c23f4c9e5 Mon Sep 17 00:00:00 2001
|
||||
From e78fda79e6171ab84d1d332197e46455b695f259 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Tue, 30 Jun 2015 15:50:41 -0400
|
||||
Subject: [PATCH 85/88] Handle rssd storage devices.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From a9c95bf3bb50ee171c80e9fe643da618afa8fdf9 Mon Sep 17 00:00:00 2001
|
||||
From d06b75f95d8d61d55b4af0b0dcb0c6717fe228d0 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Wed, 23 Mar 2016 16:49:42 -0700
|
||||
Subject: [PATCH 86/88] Fix boot when there's no TPM
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 1388967d903a07c92a39fa4e8573f7ba12f45357 Mon Sep 17 00:00:00 2001
|
||||
From dd5035e338e7362db6ef5560e3dff09a255ef797 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Wed, 23 Mar 2016 17:03:43 -0700
|
||||
Subject: [PATCH 87/88] Rework TPM measurements
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 3fded5274e9d0968fac6d37ee16f2f2d53b8594d Mon Sep 17 00:00:00 2001
|
||||
From 84b0d0562f890820097726827e98f27a789011fc Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Tue, 29 Mar 2016 15:36:49 -0700
|
||||
Subject: [PATCH 88/88] Fix event log prefix
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
Name: grub2
|
||||
Epoch: 1
|
||||
Version: 2.02
|
||||
Release: 0.28%{?dist}
|
||||
Release: 0.29%{?dist}
|
||||
Summary: Bootloader with support for Linux, Multiboot and more
|
||||
|
||||
Group: System Environment/Base
|
||||
|
@ -544,6 +544,9 @@ fi
|
|||
%{_datarootdir}/grub/themes/starfield
|
||||
|
||||
%changelog
|
||||
* Thu Apr 07 2016 Peter Jones <pjones@redhat.com> - 2.02-0.29
|
||||
- Fix ppc64 build failure on fedora-24
|
||||
|
||||
* Tue Apr 05 2016 pjones <pjones@redhat.com> - 1:2.02-0.27
|
||||
- Pull TPM updates from mjg59.
|
||||
Resolves: rhbz#1318067
|
||||
|
|
Loading…
Reference in a new issue