rpms/kernel
7
2
Fork 4
Code Issues Pull Requests Releases Activity

Fix module signing of kernel flavours

Browse Source
This commit is contained in:
Josh Boyer 2012-11-14 19:54:44 -05:00
parent 31bc2ae998
commit 19d3a2dc57
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kernel.spec
View File

@ -1766,7 +1766,11 @@ BuildKernel() {
%if %{signmodules} %if %{signmodules}
# Save off the .tmp_versions/ directory. We'll use it in the # Save off the .tmp_versions/ directory. We'll use it in the
# __debug_install_post macro below to sign the right things # __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 -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 %endif
# remove files that will be auto generated by depmod at rpm -i time # 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-` \ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-PAE.config | cut -b 3-` \
rm -rf .tmp_versions \ rm -rf .tmp_versions \
mv .tmp_versions.sign.PAE .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 \ 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/ \ %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAE/extra/ \
fi \ 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-` \ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-debug.config | cut -b 3-` \
rm -rf .tmp_versions \ rm -rf .tmp_versions \
mv .tmp_versions.sign.debug .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 \ 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/ \ %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.debug/extra/ \
fi \ 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-` \ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-PAEdebug.config | cut -b 3-` \
rm -rf .tmp_versions \ rm -rf .tmp_versions \
mv .tmp_versions.sign.PAEdebug .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 \ 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/ \ %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.PAEdebug/extra/ \
fi \ 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-` \ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}.config | cut -b 3-` \
rm -rf .tmp_versions \ rm -rf .tmp_versions \
mv .tmp_versions.sign .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} \ make -s ARCH=$Arch V=1 INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_sign KERNELRELEASE=%{KVERREL} \
%{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/extra/ \ %{SOURCE18} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/extra/ \
fi \ fi \
@ -2326,6 +2338,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %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> * Tue Nov 13 2012 Josh Boyer <jwboyer@redhat.com>
- Add patch from David Howells to fix header guards on installed kernel headers - Add patch from David Howells to fix header guards on installed kernel headers