[kernel] we don't need .tmp_versions anymore

Kyle McMartin kyle at fedoraproject.org
Mon Jan 28 15:58:47 UTC 2013


commit 249d64d9283f4b93fb92fadfe20a5f9f7d68d4b2
Author: Kyle McMartin <kmcmarti at redhat.com>
Date:   Mon Jan 28 10:43:22 2013 -0500

    we don't need .tmp_versions anymore

 kernel.spec |   18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 1ec1e91..2e86914 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1747,11 +1747,7 @@ BuildKernel() {
     %{SOURCE17} $RPM_BUILD_ROOT/lib/modules/$KernelVer %{SOURCE16}
 
 %if %{signmodules}
-    # Save off the .tmp_versions/ directory.  We'll use it in the 
-    # __debug_install_post macro below to sign the right things
-    # Also save the signing keys so we actually sign the modules with the
-    # right key.
-    cp -r .tmp_versions .tmp_versions.sign${Flav}
+    # Save the signing keys so we can sign the modules in __modsign_install_post
     cp signing_key.priv signing_key.priv.sign${Flav}
     cp signing_key.x509 signing_key.x509.sign${Flav}
 %endif
@@ -1877,33 +1873,21 @@ find Documentation -type d | xargs chmod u+w
 %define __modsign_install_post \
   if [ "%{signmodules}" == "1" ]; then \
     if [ "%{with_pae}" != "0" ]; then \
-      Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-PAE.config | cut -b 3-` \
-      rm -rf .tmp_versions \
-      mv .tmp_versions.sign.PAE .tmp_versions \
       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/ \
     fi \
     if [ "%{with_debug}" != "0" ]; then \
-      Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-debug.config | cut -b 3-` \
-      rm -rf .tmp_versions \
-      mv .tmp_versions.sign.debug .tmp_versions \
       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/ \
     fi \
     if [ "%{with_pae_debug}" != "0" ]; then \
-      Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-PAEdebug.config | cut -b 3-` \
-      rm -rf .tmp_versions \
-      mv .tmp_versions.sign.PAEdebug .tmp_versions \
       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/ \
     fi \
     if [ "%{with_up}" != "0" ]; then \
-      Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}.config | cut -b 3-` \
-      rm -rf .tmp_versions \
-      mv .tmp_versions.sign .tmp_versions \
       mv signing_key.priv.sign signing_key.priv \
       mv signing_key.x509.sign signing_key.x509 \
       %{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \


More information about the scm-commits mailing list