b546e2213b
Uprev grub2 package to 0.64. This required regeneration and restructuring of the patch and meta-patch files Depends-On: https://review.openstack.org/#/c/578440 Change-Id: I462cefad6dd929601f6368364ef83327f69be161 Signed-off-by: Scott Little <scott.little@windriver.com>
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
From 9f0825676d399b40dd28ea405f09d26c9459f1e8 Mon Sep 17 00:00:00 2001
|
|
From: jmckenna <jason.mckenna@windriver.com>
|
|
Date: Wed, 28 Mar 2018 12:53:34 -0400
|
|
Subject: [PATCH 1/2] WRS: 0010-grub2-add-tboot.patch
|
|
|
|
---
|
|
SOURCES/grub.macros | 5 +++++
|
|
SOURCES/grub.patches | 1 +
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 40cb5d5..247bb71 100755
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -78,6 +78,10 @@
|
|
%global legacy_package_arch pc
|
|
%global platform pc
|
|
|
|
+%global wrs_modules " multiboot multiboot2"
|
|
+%else
|
|
+%global wrs_modules ""
|
|
+
|
|
%endif
|
|
|
|
%ifarch aarch64
|
|
@@ -324,6 +328,7 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo \\\
|
|
search_label serial sleep syslinuxcfg test tftp \\\
|
|
video xfs" \
|
|
GRUB_MODULES+=%{efi_modules} \
|
|
+GRUB_MODULES+=%{wrs_modules} \
|
|
%{expand:%%{mkimage %{1} %{2} %{3} %{4} %{5} %{6} %{7}}} \
|
|
%{nil}
|
|
|
|
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
|
|
index b69fb31..5e63d71 100644
|
|
--- a/SOURCES/grub.patches
|
|
+++ b/SOURCES/grub.patches
|
|
@@ -258,3 +258,4 @@ Patch0257: 0257-set-rootpath.patch
|
|
Patch0258: 0258-Fix-one-more-coverity-complaint.patch
|
|
Patch0260: 0260-Fix-up-linux-params-usage.patch
|
|
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
|
|
+Patch1001: 1001-add-tboot.patch
|
|
--
|
|
1.8.3.1
|
|
|