fix for pcie regression on mvebu

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index b04eca44f78ad6d25b56e02c7063ebc8dd0a5aac..d3f3a73f17084e923d3a9c3097e0444dacbac3b6 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,7 +66,7 @@
 %endif
 
 %define                rel             1
-%define                basever         5.15
+%define                basever         5.16
 %define                postver         .5
 
 # define this to '-%{basever}' for longterm branch
@@ -118,10 +118,10 @@ Epoch:            3
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594
+# Source0-md5: e6680ce7c989a3efe58b51e3f3f0bf93
 %if "%{postver}" != ".0"
 Patch0:                https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:  532a136dcabc2a416afeaedc4108209f
+# Patch0-md5:  29ee6f1acdf80c43b0407052401fbba6
 %endif
 Source1:       kernel.sysconfig
 
@@ -212,9 +212,10 @@ Patch2004: Revert-ath-add-support-for-special-0x0-regulatory-domain.patch
 Patch7000:     kernel-inittmpfs.patch
 
 # ARM only
-Patch8000:     rpi-wm8804.patch
+Patch8000:     rpi-sound.patch
 Patch8001:     kernel-pinebook-pro.patch
 Patch8002:     atheros-disallow-retrain-nongen1-pcie.patch
+Patch8003:     mvebu-pcie.patch
 
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
@@ -666,6 +667,7 @@ cd linux-%{basever}
 %patch8000 -p1
 %patch8001 -p1
 %patch8002 -p1
+%patch8003 -p1
 %endif
 
 %if %{with rt}
@@ -935,8 +937,14 @@ cd -
 
 %{__awk} %{?debug:-v dieOnError=1} -v infile=%{objdir}/%{defconfig} -f %{SOURCE8} %{objdir}/.config
 
+%{__make} \
+       TARGETOBJ=%{targetobj} \
+       %{?with_verbose:V=1} \
+       scripts
+
 # build kernel
 export DTC_FLAGS=-@
+ICECC_EXTRAFILES="${ICECC_EXTRAFILES:+$ICECC_EXTRAFILES:}$(test -d %{objdir}/scripts/gcc-plugins && find %{objdir}/scripts/gcc-plugins -name '*.so' | paste -s -d :)"
 %{__make} \
        TARGETOBJ=%{targetobj} \
        %{?with_verbose:V=1} \
@@ -1480,6 +1488,7 @@ fi
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
 %{_kernelsrcdir}/arch/powerpc/kexec
 %{_kernelsrcdir}/arch/powerpc/kvm
+%{_kernelsrcdir}/arch/riscv/kvm
 %ifarch ppc ppc64
 %exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
 %endif