diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-04-23 19:07:29 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-04-23 19:07:29 +0200 |
| commit | 597d135d57c95fd6912e151e8cf3dc0b508bf0bb (patch) | |
| tree | db38fb4c9e385a1abaa87f65275184ec73e3fd45 /kernel.spec | |
| parent | 9065be96130fb81039d7acb0c6f1487ad5bd5bb5 (diff) | |
| parent | 5db1fe24f3c441a074c010f3669e6668dbbb0acc (diff) | |
| download | kernel-597d135d57c95fd6912e151e8cf3dc0b508bf0bb.tar.gz kernel-597d135d57c95fd6912e151e8cf3dc0b508bf0bb.tar.xz kernel-597d135d57c95fd6912e151e8cf3dc0b508bf0bb.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.1.0-0.rc6.git1.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 2c320fcf6..e3d614eb3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -130,7 +130,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Kernel headers are being split out into a separate package %if 0%{?fedora} @@ -549,8 +549,6 @@ Patch122: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch Patch201: efi-lockdown.patch -Patch202: KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch - # bz 1497559 - Make kernel MODSIGN code not error on missing variables Patch207: 0001-Make-get_cert_list-not-complain-about-cert-lists-tha.patch Patch208: 0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch @@ -602,6 +600,10 @@ Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch Patch506: 0001-s390-jump_label-Correct-asm-contraint.patch Patch507: 0001-Drop-that-for-now.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1701096 +# Submitted upstream at https://lkml.org/lkml/2019/4/23/89 +Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch + # END OF PATCH DEFINITIONS %endif @@ -1878,6 +1880,15 @@ fi # # %changelog +* Tue Apr 23 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc6.git1.1 +- Linux v5.1-rc6-4-g7142eaa58b49 + +* Tue Apr 23 2019 Jeremy Cline <jcline@redhat.com> +- Reenable debugging options. + +* Tue Apr 23 2019 Jeremy Cline <jcline@redhat.com> +- Allow modules signed by keys in the platform keyring (rbhz 1701096) + * Mon Apr 22 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc6.git0.1 - Linux v5.1-rc6 |