[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240522135444.1685642-10-haakon.bugge@oracle.com>
Date: Wed, 22 May 2024 15:54:41 +0200
From: Håkon Bugge <haakon.bugge@...cle.com>
To: linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org,
netdev@...r.kernel.org, rds-devel@....oracle.com
Cc: Jason Gunthorpe <jgg@...pe.ca>, Leon Romanovsky <leon@...nel.org>,
Saeed Mahameed <saeedm@...dia.com>, Tariq Toukan <tariqt@...dia.com>,
"David S . Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Tejun Heo <tj@...nel.org>,
Lai Jiangshan <jiangshanlai@...il.com>,
Allison Henderson <allison.henderson@...cle.com>,
Manjunath Patil <manjunath.b.patil@...cle.com>,
Mark Zhang <markzhang@...dia.com>,
Håkon Bugge <haakon.bugge@...cle.com>,
Chuck Lever <chuck.lever@...cle.com>,
Shiraz Saleem <shiraz.saleem@...el.com>,
Yang Li <yang.lee@...ux.alibaba.com>
Subject: [PATCH v3 5/6] ml: Add ol_signing_keys.pem in certs dir
From: Luci Bot <fajita@...cle.com>
ol_signing_keys.pem is copied in certs directory
Signed-off-by: Luci Bot <fajita@...cle.com>
Reviewed-by: Mark Nicholson <mark.j.nicholson@...cle.com>
---
ml-rpm/ol8/kernel-mainline.spec | 11 +++++++++++
ml-rpm/ol9/kernel-mainline.spec | 11 +++++++++++
2 files changed, 22 insertions(+)
diff --git a/ml-rpm/ol8/kernel-mainline.spec b/ml-rpm/ol8/kernel-mainline.spec
index ed47eb0706a87..8487d522984a3 100644
--- a/ml-rpm/ol8/kernel-mainline.spec
+++ b/ml-rpm/ol8/kernel-mainline.spec
@@ -483,6 +483,7 @@ BuildConflicts: rpm < 4.13.0.1-19
Source0: linux-%{kversion}.tar.bz2
%if %{signkernel}%{signmodules}
+Source9: ol_signing_keys.pem
Source10: x509.genkey
%endif
@@ -1110,6 +1111,11 @@ BuildContainerKernel() {
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${ExtraVer}/" Makefile
make %{?make_opts} mrproper
+
+%if %{signkernel}%{signmodules}
+ cp %{SOURCE10} %{SOURCE9} certs/.
+%endif
+
cp configs/config-container .config
make %{?make_opts} ARCH=$Arch %{?_kernel_cc} olddefconfig > /dev/null
@@ -1159,6 +1165,11 @@ BuildKernel() {
make %{?make_opts} mrproper
+%if %{signkernel}%{signmodules}
+ cp %{SOURCE10} %{SOURCE9} certs/.
+%endif
+
+
%if %{signkernel}%{signmodules}
cp %{SOURCE10} certs/.
%endif
diff --git a/ml-rpm/ol9/kernel-mainline.spec b/ml-rpm/ol9/kernel-mainline.spec
index 0eb7d20043ed0..6a84976f01632 100644
--- a/ml-rpm/ol9/kernel-mainline.spec
+++ b/ml-rpm/ol9/kernel-mainline.spec
@@ -458,6 +458,7 @@ BuildConflicts: rpm < 4.13.0.1-19
Source0: linux-%{kversion}.tar.bz2
%if %{signkernel}%{signmodules}
+Source9: ol_signing_keys.pem
Source10: x509.genkey
%endif
@@ -1072,6 +1073,11 @@ BuildContainerKernel() {
perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = ${ExtraVer}/" Makefile
make %{?make_opts} mrproper
+
+%if %{signkernel}%{signmodules}
+ cp %{SOURCE10} %{SOURCE9} certs/.
+%endif
+
cp configs/config-container .config
make %{?make_opts} ARCH=$Arch %{?_kernel_cc} olddefconfig > /dev/null
@@ -1121,6 +1127,11 @@ BuildKernel() {
make %{?make_opts} mrproper
+%if %{signkernel}%{signmodules}
+ cp %{SOURCE10} %{SOURCE9} certs/.
+%endif
+
+
%if %{signkernel}%{signmodules}
cp %{SOURCE10} certs/.
%endif
--
2.31.1
Powered by blists - more mailing lists