[kernel] simplify the signing stuff now that sign-file takes pub/priv key args
Kyle McMartin
kyle at fedoraproject.org
Thu Mar 28 21:37:43 UTC 2013
commit 63cb38bed692a52a79e33f41bfe42c277e578712
Author: Kyle McMartin <kyle at mcmartin.ca>
Date: Thu Mar 28 15:01:42 2013 -0400
simplify the signing stuff now that sign-file takes pub/priv key args
also fix %{with_*} tests (which jan stancek sent for rhel, thanks!)
kernel.spec | 24 ++++++++----------------
mod-sign.sh | 12 +++++-------
2 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 57fcf0c..3b92c23 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1885,25 +1885,17 @@ find Documentation -type d | xargs chmod u+w
%define __modsign_install_post \
if [ "%{signmodules}" == "1" ]; then \
- if [ "%{with_pae}" != "0" ]; then \
- mv signing_key.priv.sign.PAE signing_key.priv \
- mv signing_key.x509.sign.PAE signing_key.x509 \
- %{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAE/ \
+ if [ "%{with_pae}" -ne "0" ]; then \
+ %{modsign_cmd} signing_key.priv.sign.PAE signing_key.x509.sign.PAE $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAE/ \
fi \
- if [ "%{with_debug}" != "0" ]; then \
- mv signing_key.priv.sign.debug signing_key.priv \
- mv signing_key.x509.sign.debug signing_key.x509 \
- %{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.debug/ \
+ if [ "%{with_debug}" -ne "0" ]; then \
+ %{modsign_cmd} signing_key.priv.sign.debug signing_key.x509.sign.debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.debug/ \
fi \
- if [ "%{with_pae_debug}" != "0" ]; then \
- mv signing_key.priv.sign.PAEdebug signing_key.priv \
- mv signing_key.x509.sign.PAEdebug signing_key.x509 \
- %{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAEdebug/ \
+ if [ "%{with_pae_debug}" -ne "0" ]; then \
+ %{modsign_cmd} signing_key.priv.sign.PAEdebug signing_key.x509.sign.PAEdebug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAEdebug/ \
fi \
- if [ "%{with_up}" != "0" ]; then \
- mv signing_key.priv.sign signing_key.priv \
- mv signing_key.x509.sign signing_key.x509 \
- %{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
+ if [ "%{with_up}" != -ne "0" ]; then \
+ %{modsign_cmd} signing_key.priv.sign signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
fi \
fi \
%{nil}
diff --git a/mod-sign.sh b/mod-sign.sh
index 0e7b58c..5081e77 100755
--- a/mod-sign.sh
+++ b/mod-sign.sh
@@ -9,21 +9,19 @@
# This essentially duplicates the 'modules_sign' Kbuild target and runs the
# same commands for those modules.
-moddir=$1
+MODSECKEY=$1
+MODPUBKEY=$2
-modules=`find $moddir -name *.ko`
+moddir=$3
-MODSECKEY="./signing_key.priv"
-MODPUBKEY="./signing_key.x509"
+modules=`find $moddir -name *.ko`
for mod in $modules
do
dir=`dirname $mod`
file=`basename $mod`
- ./scripts/sign-file sha256 ${MODSECKEY} ${MODPUBKEY} ${dir}/${file} \
- ${dir}/${file}.signed
- mv ${dir}/${file}.signed ${dir}/${file}
+ ./scripts/sign-file sha256 ${MODSECKEY} ${MODPUBKEY} ${dir}/${file}
rm -f ${dir}/${file}.{sig,dig}
done
More information about the scm-commits
mailing list