X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=44d99b8d6f2ca5b8f754f676b20a68dfe7ff460f;hb=97342b40d84c1da42e0adbb9e8d4047347bf7fac;hp=693ab5130c00aa71650019b816150cfa7312d2a9;hpb=6a04b587b87efd0e42295066c3234e902f0ae561;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 693ab513..44d99b8d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,8 +68,8 @@
 %endif
 
 %define		rel		1
-%define		basever		4.19
-%define		postver		.2
+%define		basever		5.0
+%define		postver		.10
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -106,6 +106,8 @@
 %define		localversion	%{rel}
 %define		kernel_release	%{version}%{?alt_kernel:.%{alt_kernel}}-%{localversion}
 
+%define		kmod_ver	26-2
+
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(et.UTF-8):	Linuxi kernel (ehk operatsioonisüsteemi tuum)
@@ -117,11 +119,11 @@ Release:	%{rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5:	740a90cf810c2105df8ee12e5d0bb900
+Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
+# Source0-md5:	7381ce8aac80a01448e065ce795c19c0
 %if "%{postver}" != ".0"
-Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	450ad9af74244f0a6add63bc40cc9a7e
+Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
+# Patch0-md5:	a46bbfe17039c1fa81edc847af5ea664
 %endif
 Source1:	kernel.sysconfig
 
@@ -214,6 +216,7 @@ Patch500:	kernel-rt.patch
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
+Patch2004:	xfs-reclaim-hack.patch
 
 # for rescuecd
 # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
@@ -235,7 +238,7 @@ BuildRequires:	elfutils-devel
 BuildRequires:	gcc >= 6:7.2.0-6
 BuildRequires:	gcc-plugin-devel
 BuildRequires:	hostname
-BuildRequires:	kmod >= 12-2
+BuildRequires:	kmod >= %{kmod_ver}
 BuildRequires:	openssl-devel
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
@@ -246,11 +249,11 @@ BuildRequires:	uboot-mkimage
 BuildRequires:	xz >= 1:4.999.7
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 12757-8
-Requires(post):	kmod >= 12-2
+Requires(post):	kmod >= %{kmod_ver}
 Requires:	/sbin/depmod
 Requires:	coreutils
 Requires:	geninitrd >= 12757-8
-Requires:	kmod >= 12-2
+Requires:	kmod >= %{kmod_ver}
 %if %{with pae}
 %ifarch i686 athlon pentium3 pentium4
 Requires:	cpuinfo(pae)
@@ -682,9 +685,10 @@ rm -f localversion-rt
 %endif # vanilla
 
 # Small fixes:
-#%patch2000 -p1
+%patch2000 -p1
 %patch2001 -p1
 #%patch2003 -p1
+%patch2004 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1
@@ -979,8 +983,8 @@ touch $RPM_BUILD_ROOT%{initrd_dir}/initramfs-%{kernel_release}.img
 touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.dep
 %endif
 
-# /etc/modrobe.d
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}
+# /etc/depmod.d /etc/modrobe.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{depmod.d,modprobe.d}/%{kernel_release}
 
 install -d $RPM_BUILD_ROOT/etc/sysconfig
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/kernel
@@ -1271,6 +1275,7 @@ fi
 /lib/modules/%{kernel_release}/kernel/security
 /lib/modules/%{kernel_release}/kernel/virt
 
+%dir %{_sysconfdir}/depmod.d/%{kernel_release}
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
 # provided by build