55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 1260d1d47badcb7ad62a999e4a9ef901fe68c30a Mon Sep 17 00:00:00 2001
|
|
Message-Id: <1260d1d47badcb7ad62a999e4a9ef901fe68c30a.1507842722.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
|
|
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
|
|
From: Kam Nasim <kam.nasim@windriver.com>
|
|
Date: Mon, 25 Sep 2017 17:30:33 -0400
|
|
Subject: [PATCH 29/29] meta patch for Kernel IMA keyring changes
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
SPECS/kernel-rt.spec | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
|
|
index f4987fb..636a68e 100644
|
|
--- a/SPECS/kernel-rt.spec
|
|
+++ b/SPECS/kernel-rt.spec
|
|
@@ -360,6 +360,7 @@ Source27: sanity_check.py
|
|
Source29: extrakeys.pub
|
|
|
|
Source37: centos.cer
|
|
+Source38: ima_signing_key.pub
|
|
%if %{?released_kernel}
|
|
%define pesign_name redhatsecureboot301
|
|
%else
|
|
@@ -432,6 +433,7 @@ Patch1034: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
|
|
Patch1035: US101216-IMA-support-in-Titanium-kernel.patch
|
|
Patch1036: timer-reduce-timer-migration-overhead-if-disabled.patch
|
|
Patch1037: timer-minimize-nohz-off-overhead.patch
|
|
+Patch1038: US103091-IMA-System-Configuration.patch
|
|
|
|
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
|
|
|
@@ -789,6 +791,9 @@ cd linux-%{kversion}.%{_target_cpu}
|
|
# Copy any TiS-specific config changes
|
|
cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
|
|
|
|
+# Copy TiS specific IMA public key
|
|
+cp %{SOURCE38} .
|
|
+
|
|
## Apply Patches here
|
|
ApplyPatch debrand-single-cpu.patch
|
|
ApplyPatch debrand-rh_taint.patch
|
|
@@ -832,6 +837,7 @@ ApplyPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
|
|
ApplyPatch US101216-IMA-support-in-Titanium-kernel.patch
|
|
ApplyPatch timer-reduce-timer-migration-overhead-if-disabled.patch
|
|
ApplyPatch timer-minimize-nohz-off-overhead.patch
|
|
+ApplyPatch US103091-IMA-System-Configuration.patch
|
|
|
|
# move off upstream version mechanism
|
|
if [ -e localversion-rt ]; then
|
|
--
|
|
1.8.3.1
|
|
|