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

diff --git a/kernel.spec b/kernel.spec
index e3bf0f90..44d99b8d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -29,7 +29,6 @@
 %bcond_without	ipv6		# ipv6 support
 
 %bcond_without	aufs		# aufs4 support
-%bcond_without	apparmor	# UBUNTU SAUCE apparmor patches
 
 %bcond_with	vserver		# support for VServer
 
@@ -69,8 +68,8 @@
 %endif
 
 %define		rel		1
-%define		basever		4.15
-%define		postver		.1
+%define		basever		5.0
+%define		postver		.10
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -107,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)
@@ -118,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:	0d701ac1e2a67d47ce7127432df2c32b
+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:	839159e4710e11dcc836023b3d7b1bf7
+Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
+# Patch0-md5:	a46bbfe17039c1fa81edc847af5ea664
 %endif
 Source1:	kernel.sysconfig
 
@@ -196,7 +197,7 @@ Patch101:	kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs4-standalone.git
 # cd aufs4-standalone
-# git checkout -b aufs4.14 origin/aufs4.14
+# git checkout -b aufs4.17 origin/aufs4.17
 # cat aufs4-kbuild.patch aufs4-base.patch aufs4-mmap.patch aufs4-standalone.patch > ~/rpm/packages/kernel/kernel-aufs4.patch
 # rm -rf linux && mkdir linux; cp -a Documentation fs include linux
 # diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs4.patch
@@ -215,10 +216,7 @@ Patch500:	kernel-rt.patch
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
-
-# https://gitlab.com/apparmor/apparmor/tree/master/kernel-patches/v4.15
-Patch5001:	0001-apparmor-add-base-infastructure-for-socket-mediation.patch
-Patch5002:	0002-apparmor-af_unix-mediation.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
@@ -240,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
@@ -250,12 +248,12 @@ BuildRequires:	uboot-mkimage
 %endif
 BuildRequires:	xz >= 1:4.999.7
 Requires(post):	coreutils
-Requires(post):	geninitrd >= 12749
-Requires(post):	kmod >= 12-2
+Requires(post):	geninitrd >= 12757-8
+Requires(post):	kmod >= %{kmod_ver}
 Requires:	/sbin/depmod
 Requires:	coreutils
-Requires:	geninitrd >= 12749
-Requires:	kmod >= 12-2
+Requires:	geninitrd >= 12757-8
+Requires:	kmod >= %{kmod_ver}
 %if %{with pae}
 %ifarch i686 athlon pentium3 pentium4
 Requires:	cpuinfo(pae)
@@ -682,12 +680,6 @@ cd linux-%{basever}
 rm -f localversion-rt
 %endif
 
-# apparmor
-%if %{with apparmor}
-%patch5001 -p1
-%patch5002 -p1
-%endif
-
 %patch250 -p1
 
 %endif # vanilla
@@ -696,6 +688,7 @@ rm -f localversion-rt
 %patch2000 -p1
 %patch2001 -p1
 #%patch2003 -p1
+%patch2004 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1
@@ -990,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
@@ -1282,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
@@ -1397,8 +1391,6 @@ fi
 %{_kernelsrcdir}/kernel/bounds.c
 %{_kernelsrcdir}/scripts/basic/*.c
 %attr(755,root,root) %{_kernelsrcdir}/scripts/kconfig/*.sh
-%{_kernelsrcdir}/scripts/kconfig/*.in
-%{_kernelsrcdir}/scripts/kconfig/*_shipped
 %{_kernelsrcdir}/scripts/kconfig/*.pl
 %{_kernelsrcdir}/scripts/kconfig/*.glade
 %{_kernelsrcdir}/scripts/kconfig/*.cc
@@ -1416,6 +1408,7 @@ fi
 %{_kernelsrcdir}/scripts/mkmakefile
 %{_kernelsrcdir}/scripts/module-common.lds
 %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
+%{_kernelsrcdir}/scripts/subarch.include
 %{_kernelsrcdir}/scripts/*.c
 %{_kernelsrcdir}/scripts/*.h
 %attr(755,root,root) %{_kernelsrcdir}/scripts/*.sh
@@ -1488,6 +1481,7 @@ fi
 %exclude %{_kernelsrcdir}/scripts/mod
 %exclude %{_kernelsrcdir}/scripts/module-common.lds
 %exclude %{_kernelsrcdir}/scripts/setlocalversion
+%exclude %{_kernelsrcdir}/scripts/subarch.include
 %exclude %{_kernelsrcdir}/scripts/*.c
 %exclude %{_kernelsrcdir}/scripts/*.h
 %exclude %{_kernelsrcdir}/scripts/*.sh