diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-03-13 05:05:17 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-03-13 05:05:17 +0100 |
commit | d4a1c0f1dfdc58dbb91019b4ad95a9f2e3a0f709 (patch) | |
tree | ebf0cb52efe87b9df2b363c94c232e7adb0eecb3 /kernel.spec | |
parent | 35d47fcdcceb19ba381f777734ac8fa06208bbd6 (diff) | |
parent | e5f6e556b233245d6f05bca3ce00e76c021c7859 (diff) | |
download | kernel-d4a1c0f1dfdc58dbb91019b4ad95a9f2e3a0f709.tar.gz kernel-d4a1c0f1dfdc58dbb91019b4ad95a9f2e3a0f709.tar.xz kernel-d4a1c0f1dfdc58dbb91019b4ad95a9f2e3a0f709.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.6.0-0.rc5.git1.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index b5d9f0d5f..0454a2e6e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -115,7 +115,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 5 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -208,7 +208,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 %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -839,7 +839,7 @@ Patch304: ARM-tegra-usb-no-reset.patch # Raspberry Pi # https://patchwork.kernel.org/cover/11353083/ Patch310: arm64-pinctrl-bcm2835-Add-support-for-all-BCM2711-GPIOs.patch -# https://patchwork.kernel.org/cover/11423693/ +# v5 https://patchwork.kernel.org/cover/11429245/ Patch311: USB-pci-quirks-Add-Raspberry-Pi-4-quirk.patch # https://patchwork.kernel.org/patch/11372935/ Patch312: bcm2835-irqchip-Quiesce-IRQs-left-enabled-by-bootloader.patch @@ -907,6 +907,9 @@ Patch507: drm-dp-mst-error-handling-improvements.patch # Submitted upstream Patch508: iommu-WARN_TAINT-fixes.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1811850 +Patch509: drm-i915-backports.patch + # END OF PATCH DEFINITIONS %endif @@ -1900,6 +1903,9 @@ BuildKernel() { mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/internal mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates +%if 0%{!?fedora:1} + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/weak-updates +%endif # CONFIG_KERNEL_HEADER_TEST generates some extra files in the process of # testing so just delete find . -name *.h.s -delete @@ -2445,7 +2451,11 @@ find $RPM_BUILD_ROOT/usr/include \ %endif %if %{with_cross_headers} +%if 0%{?fedora} HDR_ARCH_LIST='arm arm64 powerpc s390 x86' +%else +HDR_ARCH_LIST='arm64 powerpc s390 x86' +%endif mkdir -p $RPM_BUILD_ROOT/usr/tmp-headers for arch in $HDR_ARCH_LIST; do @@ -2694,6 +2704,12 @@ fi\ # %define kernel_variant_posttrans() \ %{expand:%%posttrans %{?1:%{1}-}core}\ +%if 0%{!?fedora:1}\ +if [ -x %{_sbindir}/weak-modules ]\ +then\ + %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ +fi\ +%endif\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2723,6 +2739,12 @@ fi}\ %define kernel_variant_preun() \ %{expand:%%preun %{?1:%{1}-}core}\ /bin/kernel-install remove %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ +%if 0%{!?fedora:1}\ +if [ -x %{_sbindir}/weak-modules ]\ +then\ + %{_sbindir}/weak-modules --remove-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ +fi\ +%endif\ %{nil} %kernel_variant_preun @@ -2930,6 +2952,9 @@ fi /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\ /lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\ +%if 0%{!?fedora:1}\ +/lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\ +%endif\ %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}/kernel-signing-ca.cer\ %ifarch s390x ppc64le\ %if 0%{!?4:1}\ @@ -2983,6 +3008,15 @@ fi # # %changelog +* Thu Mar 12 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc5.git1.1 +- Linux v5.6-rc5-53-g3cc6e2c599cd + +* Thu Mar 12 2020 Jeremy Cline <jcline@redhat.com> +- Reenable debugging options. + +* Tue Mar 10 2020 Jeremy Cline <jcline@redhat.com> +- A series of eDP backlight fixes for i915 (rhbz 1811850) + * Mon Mar 09 2020 Hans de Goede <hdegoede@redhat.com> - Fix only 1 monitor working on DP-MST docking stations (rhbz 1809681) - Fix backtraces on various buggy BIOS-es (rhbz 1564895, 1808874) |