X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=74bb744325b23f296cd2adcdf782afff6988395d;hb=bc7a73a3aee26e57ee8b1c00c21e3193df90ece8;hp=6042637bff2282f71ddc7c4979a8f443dbe242fa;hpb=758e9dad9651b5d1bad74f209dd0633e7a713660;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 6042637b..74bb7443 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,8 +66,8 @@
 %endif
 
 %define		rel		1
-%define		basever		5.15
-%define		postver		.0
+%define		basever		5.16
+%define		postver		.13
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -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:	6e3c6ac02a1f625f5057a2eb6b15565e
+# Patch0-md5:	08be6c5180bfa84d0abc9938f09522da
 %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.
@@ -262,7 +263,7 @@ Requires:	cpuinfo(pae)
 Suggests:	crda
 Suggests:	dracut
 Suggests:	keyutils
-Requires:	linux-firmware
+Suggests:	linux-firmware
 Provides:	%{name}(netfilter) = 20070806
 Provides:	%{name}(vermagic) = %{kernel_release}
 Obsoletes:	kernel%{_alt_kernel}-char-lirc-ene0100 < 0.9.0
@@ -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} \
@@ -944,7 +952,7 @@ export DTC_FLAGS=-@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} modules_install \
+%{__make} %{MakeOpts} %{!?with_verbose:-s} modules_install \
 	-C %{objdir} \
 	%{?with_verbose:V=1} \
 	DEPMOD=%{DepMod} \
@@ -1119,7 +1127,8 @@ if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
 	ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
 	ln -sf System.map-%{kernel_release} /boot/System.map
 %ifarch %{arm} aarch64
-	mv -f /boot/dtb{,.old} 2> /dev/null
+	test -L /boot/dtb.old && rm /boot/dtb.old
+	test ! -e /boot/dtb.old && mv -f /boot/dtb{,.old} 2> /dev/null
 	ln -sf dtb-%{kernel_release} /boot/dtb
 %endif
 %if 0%{?alt_kernel:1}
@@ -1480,6 +1489,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