diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-11-14 19:54:44 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-11-14 21:45:22 -0500 |
| commit | 19d3a2dc57cc5c4f673bf4e05fad39d54fc4448f (patch) | |
| tree | e69bcf59e62f88ae27b4f68aff1654188aaaab09 /kernel.spec | |
| parent | 31bc2ae998b5ac1912064d746d5c31638943f4c1 (diff) | |
| download | kernel-19d3a2dc57cc5c4f673bf4e05fad39d54fc4448f.tar.gz kernel-19d3a2dc57cc5c4f673bf4e05fad39d54fc4448f.tar.xz kernel-19d3a2dc57cc5c4f673bf4e05fad39d54fc4448f.zip | |
Fix module signing of kernel flavours
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index f04da4ac..274079ee 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1766,7 +1766,11 @@ BuildKernel() { %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${Flavour:+.${Flavour}} + cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}} + cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}} %endif # remove files that will be auto generated by depmod at rpm -i time @@ -1913,6 +1917,8 @@ find Documentation -type d | xargs chmod u+w 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 \ make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL}.PAE \ %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAE/extra/ \ fi \ @@ -1921,6 +1927,8 @@ find Documentation -type d | xargs chmod u+w 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 \ make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL}.debug \ %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.debug/extra/ \ fi \ @@ -1929,6 +1937,8 @@ find Documentation -type d | xargs chmod u+w 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 \ make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL}.PAEdebug \ %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAEdebug/extra/ \ fi \ @@ -1937,6 +1947,8 @@ find Documentation -type d | xargs chmod u+w 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 \ make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL} \ %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/extra/ \ fi \ @@ -2326,6 +2338,9 @@ fi # ||----w | # || || %changelog +* Wed Nov 14 2012 Josh Boyer <jwboyer@redhat.com> +- Fix module signing of kernel flavours + * Tue Nov 13 2012 Josh Boyer <jwboyer@redhat.com> - Add patch from David Howells to fix header guards on installed kernel headers |