diff options
| author | Kyle McMartin <kmcmarti@redhat.com> | 2013-01-28 10:43:22 -0500 |
|---|---|---|
| committer | Kyle McMartin <kmcmarti@redhat.com> | 2013-01-28 10:58:02 -0500 |
| commit | 249d64d9283f4b93fb92fadfe20a5f9f7d68d4b2 (patch) | |
| tree | c61eeb3a9a42031e5cd438ee06569d50240103c0 | |
| parent | f28d195902b8d17638a573bb84fd01cda650cd38 (diff) | |
| download | kernel-249d64d9283f4b93fb92fadfe20a5f9f7d68d4b2.tar.gz kernel-249d64d9283f4b93fb92fadfe20a5f9f7d68d4b2.tar.xz kernel-249d64d9283f4b93fb92fadfe20a5f9f7d68d4b2.zip | |
we don't need .tmp_versions anymore
| -rw-r--r-- | kernel.spec | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/kernel.spec b/kernel.spec index 1ec1e91f8..2e86914a7 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}/ \ |