X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=16123fd60a6ae15cc89076d7d5fe24fedd3c8409;hb=ecfb01fb9899ec9dc82a19355c0c02aa2994c9f9;hp=aedeb69b7efd8cae5496d5df3add5baee6e9af16;hpb=6d1765514cb22667c025eb69327c29f5a698444f;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index aedeb69b..16123fd6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -66,11 +66,11 @@
 %endif
 
 %define		rel		1
-%define		basever		5.14
-%define		postver		.1
+%define		basever		5.15
+%define		postver		.89
 
 # define this to '-%{basever}' for longterm branch
-%define		versuffix	%{nil}
+%define		versuffix	-%{basever}
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -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:	a082ef5748b813abca0649dab8be5f52
+# Source0-md5:	071d49ff4e020d58c04f9f3f76d3b594
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	0e03bc49d0db9ae31a5086ec49be3768
+# Patch0-md5:	357072a1d58d5e370b0fa8e6b3581daa
 %endif
 Source1:	kernel.sysconfig
 
@@ -205,14 +205,13 @@ Patch500:	kernel-rt.patch
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
-Patch2004:	Revert-ath-add-support-for-special-0x0-regulatory-domain.patch
 
 # for rescuecd
 # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
 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
 
@@ -241,7 +240,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	openssl-tools
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
-BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	rpmbuild(macros) >= 2.019
 BuildRequires:	tar >= 1:1.22
 %ifarch ppc
 BuildRequires:	uboot-mkimage
@@ -262,7 +261,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
@@ -530,7 +529,7 @@ Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Requires:	elfutils-devel
 Requires:	make
-Conflicts:	rpmbuild(macros) < 1.704
+Conflicts:	rpmbuild(macros) < 2.019
 AutoReqProv:	no
 
 %description module-build
@@ -681,7 +680,6 @@ rm -f localversion-rt
 %patch2000 -p1
 %patch2001 -p1
 #%patch2003 -p1
-%patch2004 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1
@@ -935,8 +933,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} \
@@ -1118,6 +1122,10 @@ if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
 	mv -f /boot/System.map{,.old} 2> /dev/null
 	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
+	ln -sf dtb-%{kernel_release} /boot/dtb
+%endif
 %if 0%{?alt_kernel:1}
 	mv -f /boot/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null
 	mv -f /boot/System%{_alt_kernel}.map{,.old} 2> /dev/null