On 07.03.2016 07:40, Thorsten Leemhuis wrote:
Hi Justin! Please consider merging the two patches I'll send as
reply to
this mail.
From 231a1930cec3ba799b606128e63d5a9e556ffcc0 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <fedora(a)leemhuis.info>
Date: Sun, 6 Mar 2016 20:19:02 +0100
Subject: [PATCH 1/2] add signkernel macro to make signing kernel and signing
modules independent from each other
---
kernel.spec | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/kernel.spec b/kernel.spec
index 6783bb3..6081458 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -11,9 +11,11 @@ Summary: The Linux kernel
# Sign modules on x86. Make sure the config files match this setting if more
# architectures are added.
%ifarch %{ix86} x86_64
+%global signkernel 1
%global signmodules 1
%global zipmodules 1
%else
+%global signkernel 0
%global signmodules 0
%global zipmodules 0
%endif
@@ -396,7 +398,7 @@ BuildRequires: rpm-build, elfutils
BuildRequires: openssl openssl-devel
%endif
-%if %{signmodules}
+%if %{signkernel}
BuildRequires: pesign >= 0.10-4
%endif
@@ -1335,7 +1337,7 @@ BuildKernel() {
make -s mrproper
cp configs/$Config .config
- %if %{signmodules}
+ %if %{signkernel}%{signmodules}
cp %{SOURCE11} certs/.
%endif
@@ -1372,7 +1374,7 @@ BuildKernel() {
cp arch/$Arch/boot/zImage.stub
$RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
cp arch/$Arch/boot/zImage.stub
$RPM_BUILD_ROOT/lib/modules/$KernelVer/zImage.stub-$KernelVer || :
fi
- %if %{signmodules}
+ %if %{signkernel}
# Sign the image if we're using EFI
%pesign -s -i $KernelImage -o vmlinuz.signed
if [ ! -s vmlinuz.signed ]; then
@@ -2144,6 +2146,10 @@ fi
- Fix ethernet naming on Armada 38x devices
- Serial console fixes for Tegra
+* Sat Mar 5 2016 Thorsten Leemhuis <fedora(a)leemhuis.info>
+- add signkernel macro to make signing kernel and signing modules
+ independent from each other
+
* Fri Mar 04 2016 Justin M. Forbes <jforbes(a)fedoraproject.org> -
4.5.0-0.rc6.git3.1
- Linux v4.5-rc6-41-ge3c2ef4
--
1.8.3.1