Fix build for new certificate setup in 4.3.
Also a small fix for perf related installed files
This commit is contained in:
parent
1adb467330
commit
777d869b10
19
kernel.spec
19
kernel.spec
|
@ -389,7 +389,7 @@ BuildRequires: rpm-build, elfutils
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{signmodules}
|
%if %{signmodules}
|
||||||
BuildRequires: openssl
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: pesign >= 0.10-4
|
BuildRequires: pesign >= 0.10-4
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
@ -1311,11 +1311,9 @@ BuildKernel() {
|
||||||
cp configs/$Config .config
|
cp configs/$Config .config
|
||||||
|
|
||||||
%if %{signmodules}
|
%if %{signmodules}
|
||||||
cp %{SOURCE11} .
|
cp %{SOURCE11} certs/.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
chmod +x scripts/sign-file
|
|
||||||
|
|
||||||
Arch=`head -1 .config | cut -b 3-`
|
Arch=`head -1 .config | cut -b 3-`
|
||||||
echo USING ARCH=$Arch
|
echo USING ARCH=$Arch
|
||||||
|
|
||||||
|
@ -1557,8 +1555,8 @@ BuildKernel() {
|
||||||
|
|
||||||
%if %{signmodules}
|
%if %{signmodules}
|
||||||
# Save the signing keys so we can sign the modules in __modsign_install_post
|
# Save the signing keys so we can sign the modules in __modsign_install_post
|
||||||
cp signing_key.priv signing_key.priv.sign${Flav}
|
cp certs/signing_key.pem certs/signing_key.pem.sign${Flav}
|
||||||
cp signing_key.x509 signing_key.x509.sign${Flav}
|
cp certs/signing_key.x509 certs/signing_key.x509.sign${Flav}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Move the devel headers out of the root file system
|
# Move the devel headers out of the root file system
|
||||||
|
@ -1653,16 +1651,16 @@ popd
|
||||||
%define __modsign_install_post \
|
%define __modsign_install_post \
|
||||||
if [ "%{signmodules}" -eq "1" ]; then \
|
if [ "%{signmodules}" -eq "1" ]; then \
|
||||||
if [ "%{with_pae}" -ne "0" ]; then \
|
if [ "%{with_pae}" -ne "0" ]; then \
|
||||||
%{modsign_cmd} signing_key.priv.sign+%{pae} signing_key.x509.sign+%{pae} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}/ \
|
%{modsign_cmd} certs/signing_key.pem.sign+%{pae} certs/signing_key.x509.sign+%{pae} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}/ \
|
||||||
fi \
|
fi \
|
||||||
if [ "%{with_debug}" -ne "0" ]; then \
|
if [ "%{with_debug}" -ne "0" ]; then \
|
||||||
%{modsign_cmd} signing_key.priv.sign+debug signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
|
%{modsign_cmd} certs/signing_key.pem.sign+debug certs/signing_key.x509.sign+debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+debug/ \
|
||||||
fi \
|
fi \
|
||||||
if [ "%{with_pae_debug}" -ne "0" ]; then \
|
if [ "%{with_pae_debug}" -ne "0" ]; then \
|
||||||
%{modsign_cmd} signing_key.priv.sign+%{pae}debug signing_key.x509.sign+%{pae}debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}debug/ \
|
%{modsign_cmd} certs/signing_key.pem.sign+%{pae}debug certs/signing_key.x509.sign+%{pae}debug $RPM_BUILD_ROOT/lib/modules/%{KVERREL}+%{pae}debug/ \
|
||||||
fi \
|
fi \
|
||||||
if [ "%{with_up}" -ne "0" ]; then \
|
if [ "%{with_up}" -ne "0" ]; then \
|
||||||
%{modsign_cmd} signing_key.priv.sign signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
|
%{modsign_cmd} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
|
||||||
fi \
|
fi \
|
||||||
fi \
|
fi \
|
||||||
if [ "%{zipmodules}" -eq "1" ]; then \
|
if [ "%{zipmodules}" -eq "1" ]; then \
|
||||||
|
@ -1923,6 +1921,7 @@ fi
|
||||||
%{_libdir}/traceevent/plugins/*
|
%{_libdir}/traceevent/plugins/*
|
||||||
%dir %{_libexecdir}/perf-core
|
%dir %{_libexecdir}/perf-core
|
||||||
%{_libexecdir}/perf-core/*
|
%{_libexecdir}/perf-core/*
|
||||||
|
%{_datadir}/perf-core/*
|
||||||
%{_mandir}/man[1-8]/perf*
|
%{_mandir}/man[1-8]/perf*
|
||||||
%{_sysconfdir}/bash_completion.d/perf
|
%{_sysconfdir}/bash_completion.d/perf
|
||||||
%doc linux-%{KVERREL}/tools/perf/Documentation/examples.txt
|
%doc linux-%{KVERREL}/tools/perf/Documentation/examples.txt
|
||||||
|
|
Loading…
Reference in New Issue