589e8020db
This commit results in no change to actual code. It cleans up the following issues in the meta patches: - some patches generated fuzz and offset warnings - patch file names do not match that generated by git format-patch - some patches were not in git format, did not have a proper git header - some patches were not signed off by anybody - file names contained grub2 which is redundant - one patch added a blank line to the end of a file generating a warning, and a subsequent patch removed it. This has now been squashed out. There are 13 patches in total, they were numbered 1-14 with 4 being absent. They are now numbered 1-13. Verification: Built and captured the output, verified that there are no more fuzz and offset warnings. Closes-Bug: 1959037 Change-Id: I8056adf3ee96dc036262aa8c2d9eecfc353cc5ba Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 9b47b5107a4017c266b59093514dbdee603b0bdc Mon Sep 17 00:00:00 2001
|
|
Message-Id: <9b47b5107a4017c266b59093514dbdee603b0bdc.1643237526.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <8b5576704440696a7c8f1b00735217bf1745b6a1.1643237526.git.Jim.Somerville@windriver.com>
|
|
References: <8b5576704440696a7c8f1b00735217bf1745b6a1.1643237526.git.Jim.Somerville@windriver.com>
|
|
From: jmckenna <jason.mckenna@windriver.com>
|
|
Date: Wed, 28 Mar 2018 12:53:34 -0400
|
|
Subject: [PATCH 09/13] add tboot
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
SOURCES/grub.macros | 5 +++++
|
|
SOURCES/grub.patches | 1 +
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index c945920..b279e7d 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -82,6 +82,10 @@
|
|
%global legacy_package_arch pc
|
|
%global platform pc
|
|
|
|
+%global wrs_modules " multiboot multiboot2"
|
|
+%else
|
|
+%global wrs_modules ""
|
|
+
|
|
%endif
|
|
|
|
%ifarch aarch64
|
|
@@ -331,6 +335,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} %{8} %{9} %{10}}} \
|
|
%{nil}
|
|
|
|
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
|
|
index ab69be2..ba47129 100644
|
|
--- a/SOURCES/grub.patches
|
|
+++ b/SOURCES/grub.patches
|
|
@@ -333,3 +333,4 @@ Patch0332: 0332-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
|
|
Patch0333: 0333-linuxefi-fail-kernel-validation-without-shim-protoco.patch
|
|
Patch0334: 0334-linux-Fix-integer-overflows-in-initrd-size-handling.patch
|
|
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
|
|
+Patch1001: 1001-add-tboot.patch
|
|
--
|
|
2.29.2
|
|
|