diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-09 11:10:06 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-09 11:10:17 -0400 |
| commit | 18c82493e579cff717864e8931960040bd820b33 (patch) | |
| tree | 42493f93faa2f0b8f8d84ad46ef9a8a86bdd2fb9 /kernel.spec | |
| parent | 818326ffa2208b592aa1d46ae62d1f562dbb89ea (diff) | |
| download | kernel-18c82493e579cff717864e8931960040bd820b33.tar.gz kernel-18c82493e579cff717864e8931960040bd820b33.tar.xz kernel-18c82493e579cff717864e8931960040bd820b33.zip | |
Linux v4.2-10637-ga794b4f32921
- Rework secure boot patchset
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec index 043af017a..c2306c32f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 9 +%define gitrev 10 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -389,7 +389,7 @@ BuildRequires: rpm-build, elfutils %endif %if %{signmodules} -BuildRequires: openssl +BuildRequires: openssl-devel BuildRequires: pesign >= 0.10-4 %endif @@ -1304,11 +1304,9 @@ BuildKernel() { cp configs/$Config .config %if %{signmodules} - cp %{SOURCE11} . + cp %{SOURCE11} certs/. %endif - chmod +x scripts/sign-file - Arch=`head -1 .config | cut -b 3-` echo USING ARCH=$Arch @@ -1550,8 +1548,8 @@ BuildKernel() { %if %{signmodules} # 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} + cp certs/signing_key.pem certs/signing_key.pem.sign${Flav} + cp certs/signing_key.x509 certs/signing_key.x509.sign${Flav} %endif # Move the devel headers out of the root file system @@ -1646,16 +1644,16 @@ popd %define __modsign_install_post \ if [ "%{signmodules}" -eq "1" ]; 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 \ 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 \ 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 \ 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 \ if [ "%{zipmodules}" -eq "1" ]; then \ @@ -2046,6 +2044,10 @@ fi # # %changelog +* Wed Sep 09 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.3.0-0.rc0.git10.1 +- Linux v4.2-10637-ga794b4f32921 +- Rework secure boot patchset + * Tue Sep 8 2015 Peter Robinson <pbrobinson@fedoraproject.org> - Config updates for ARMv7/aarch64 |