53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
From 49857784e8efe0aeedc17206240064273ce458a6 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <49857784e8efe0aeedc17206240064273ce458a6.1507220788.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
|
|
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
|
|
From: Kam Nasim <kam.nasim@windriver.com>
|
|
Date: Mon, 25 Sep 2017 17:20:15 -0400
|
|
Subject: [PATCH 25/25] meta patch for Kernel IMA keyring changes
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
SPECS/kernel.spec | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
|
|
index bb5a106..62103ae 100644
|
|
--- a/SPECS/kernel.spec
|
|
+++ b/SPECS/kernel.spec
|
|
@@ -417,6 +417,7 @@ Patch1002: debrand-rh-i686-cpu.patch
|
|
# Not sure if we need to worry about numerical collisions between
|
|
# SourceX and PatchX, so let's not risk it
|
|
Source30000: kernel-3.10.0-x86_64.config.tis_extra
|
|
+Source30001: ima_signing_key.pub
|
|
|
|
# Titanium Cloud patches here.
|
|
Patch40001: Fix-compile-issue-when-transparent-hugepages-are-off.patch
|
|
@@ -447,6 +448,7 @@ Patch40030: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
|
|
Patch40031: nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
|
|
Patch40032: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
|
|
Patch40033: US101216-IMA-support-in-Titanium-kernel.patch
|
|
+Patch40036: US103091-IMA-System-Configuration.patch
|
|
|
|
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
|
|
|
|
@@ -798,6 +800,7 @@ ApplyOptionalPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
|
|
ApplyOptionalPatch nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
|
|
ApplyOptionalPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
|
|
ApplyOptionalPatch US101216-IMA-support-in-Titanium-kernel.patch
|
|
+ApplyOptionalPatch US103091-IMA-System-Configuration.patch
|
|
|
|
# Any further pre-build tree manipulations happen here.
|
|
|
|
@@ -926,6 +929,7 @@ BuildKernel() {
|
|
cp %{SOURCE12} . # extra_certificates
|
|
cp %{SOURCE15} . # rheldup3.x509
|
|
cp %{SOURCE16} . # rhelkpatch1.x509
|
|
+ cp %{SOURCE30001} . # ima_signing_key.pub
|
|
|
|
cp configs/$Config .config
|
|
|
|
--
|
|
1.8.3.1
|
|
|