From 252298034c96024446e662c6693e0d0c9952bd4c Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 10 Mar 2020 14:48:32 -0400 Subject: A series of eDP backlight fixes for i915 (rhbz 1811850) --- kernel.spec | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index aa807220b..bc1c0baa9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -890,6 +890,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 @@ -2963,6 +2966,9 @@ fi # # %changelog +* Tue Mar 10 2020 Jeremy Cline +- A series of eDP backlight fixes for i915 (rhbz 1811850) + * Mon Mar 09 2020 Hans de Goede - Fix only 1 monitor working on DP-MST docking stations (rhbz 1809681) - Fix backtraces on various buggy BIOS-es (rhbz 1564895, 1808874) -- cgit From fc7e20c59ee70306a2d2204d02c0b114ed4ffb98 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 12 Mar 2020 13:01:59 +0000 Subject: Update RPi4 USB patch to v5 --- kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index bc1c0baa9..1f99f3962 100644 --- a/kernel.spec +++ b/kernel.spec @@ -822,7 +822,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 -- cgit From 2027ad30fb0780518e9113815eea9601f49e1fe8 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 12 Mar 2020 11:41:51 -0400 Subject: Add weak-modules packaging back for not-Fedora The weak-module scripts are used in EL, but have been problematic for Fedora, so only include them if the build target isn't Fedora. Signed-off-by: Jeremy Cline --- kernel.spec | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 1f99f3962..4353b3c04 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1883,6 +1883,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 @@ -2677,6 +2680,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} @@ -2706,6 +2715,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 @@ -2913,6 +2928,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}\ -- cgit From ffafed24c5d5a502276f41a778020dfbc4da7615 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 12 Mar 2020 11:45:10 -0400 Subject: Make HDR_ARCH_LIST conditional on the build target EL kernels don't target arm, just arm64, so if we're not building for Fedora drop arm. Signed-off-by: Jeremy Cline --- kernel.spec | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 4353b3c04..90e3b205d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2431,7 +2431,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 -- cgit From d12da21c1c907137f1eb7aa0052830bad0e23b28 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 12 Mar 2020 16:16:39 -0400 Subject: Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 90e3b205d..24cd13bdf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -200,7 +200,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 @@ -2988,6 +2988,9 @@ fi # # %changelog +* Thu Mar 12 2020 Jeremy Cline +- Reenable debugging options. + * Tue Mar 10 2020 Jeremy Cline - A series of eDP backlight fixes for i915 (rhbz 1811850) -- cgit From e5f6e556b233245d6f05bca3ce00e76c021c7859 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 12 Mar 2020 16:32:30 -0400 Subject: Linux v5.6-rc5-53-g3cc6e2c599cd --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 24cd13bdf..15d266a7b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -107,7 +107,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 @@ -2988,6 +2988,9 @@ fi # # %changelog +* Thu Mar 12 2020 Jeremy Cline - 5.6.0-0.rc5.git1.1 +- Linux v5.6-rc5-53-g3cc6e2c599cd + * Thu Mar 12 2020 Jeremy Cline - Reenable debugging options. -- cgit