Fix module signing of kernel flavours
This commit is contained in:
parent
40406340d2
commit
de28018acf
17
kernel.spec
17
kernel.spec
|
@ -62,7 +62,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 6
|
||||
%global baserelease 7
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
@ -1833,7 +1833,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
|
||||
|
@ -1980,6 +1984,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 \
|
||||
|
@ -1988,6 +1994,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 \
|
||||
|
@ -1996,6 +2004,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 \
|
||||
|
@ -2004,6 +2014,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 \
|
||||
|
@ -2392,6 +2404,9 @@ fi
|
|||
# ||----w |
|
||||
# || ||
|
||||
%changelog
|
||||
* Wed Nov 14 2012 Josh Boyer <jwboyer@redhat.com>
|
||||
- Fix module signing of kernel flavours
|
||||
|
||||
* Mon Nov 12 2012 Justin M. Forbes <jforbes@redhat.com>
|
||||
- fix list_del corruption warning on USB audio with twinkle (rhbz 871078)
|
||||
|
||||
|
|
Loading…
Reference in New Issue