X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=c615b0ab2e1b8149c2f5f0aa04269f4f862c3ffe;hb=0f2261d2d7fe3d98a04e6fd36048183692b6e92e;hp=01daa610f74c46a7f77a6c3a2e03930ebaec5480;hpb=025d656026163bb2c81c59dd06542a20f2586b83;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 01daa610..c615b0ab 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -22,7 +22,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 
 %bcond_with	fbcondecor	# build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
-%bcond_without	pae		# build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
+%bcond_with	pae		# build PAE (HIGHMEM64G) support on 32bit i686 athlon pentium3 pentium4
 %bcond_with	nfsroot		# build with root on NFS support
 
 %bcond_without	imq		# imq support
@@ -67,9 +67,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		4.20
-%define		postver		.8
+%define		rel		2
+%define		basever		5.6
+%define		postver		.0
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -93,8 +93,8 @@
 %if %{with vanilla}
 %define		alt_kernel	vanilla
 %endif
-%if %{without pae}
-%define		alt_kernel	nopae
+%if %{with pae}
+%define		alt_kernel	pae
 %endif
 %if %{with rt}
 %define		alt_kernel	rt
@@ -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:	d39dd4ba2d5861c54b90d49be19eaf31
+Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
+# Source0-md5:	7b9199ec5fa563ece9ed585ffb17798f
 %if "%{postver}" != ".0"
-Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	737555b69c43ef91956733d89d7457a5
+Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
+# Patch0-md5:	914bdb8d023b52168272723c9c8eb678
 %endif
 Source1:	kernel.sysconfig
 
@@ -191,18 +193,18 @@ Patch85:	kernel-hostap.patch
 Patch100:	kernel-vserver-2.3.patch
 Patch101:	kernel-vserver-fixes.patch
 
-# git://github.com/sfjro/aufs4-standalone.git, read README
+# git://github.com/sfjro/aufs5-standalone.git, read README
 # Patch creation:
-# git clone git://github.com/sfjro/aufs4-standalone.git
-# cd aufs4-standalone
-# 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
+# git clone git://github.com/sfjro/aufs5-standalone.git
+# cd aufs5-standalone
+# git checkout -b aufs5.4 origin/aufs5.4
+# cat aufs5-kbuild.patch aufs5-base.patch aufs5-mmap.patch aufs5-standalone.patch > ~/rpm/packages/kernel/kernel-aufs5.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
-# cat aufs4-loopback.patch >> ~/rpm/packages/kernel/kernel-aufs4.patch
+# diff -urN /usr/share/empty linux | filterdiff -x linux/include/uapi/linux/Kbuild >> ~/rpm/packages/kernel/kernel-aufs5.patch
+# cat aufs5-loopback.patch >> ~/rpm/packages/kernel/kernel-aufs5.patch
 #
-Patch145:	kernel-aufs4.patch
-Patch146:	kernel-aufs4+vserver.patch
+Patch145:	kernel-aufs5.patch
+Patch146:	kernel-aufs+vserver.patch
 
 # Show normal colors in menuconfig with ncurses ABI 6
 Patch250:	kernel-fix_256colors_menuconfig.patch
@@ -229,29 +231,33 @@ AutoReqProv:	no
 BuildRequires:	/sbin/depmod
 BuildRequires:	bc
 BuildRequires:	binutils >= 3:2.18
+BuildRequires:	bison
 %ifarch sparc sparc64
 BuildRequires:	elftoaout
 %endif
 BuildRequires:	elfutils-devel
+BuildRequires:	flex
 BuildRequires:	gcc >= 6:7.2.0-6
+BuildRequires:	gcc-c++
 BuildRequires:	gcc-plugin-devel
 BuildRequires:	hostname
-BuildRequires:	kmod >= 12-2
+BuildRequires:	kmod >= %{kmod_ver}
+BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
-BuildRequires:	rpmbuild(macros) >= 1.707
+BuildRequires:	rpmbuild(macros) >= 1.743
 %ifarch ppc
 BuildRequires:	uboot-mkimage
 %endif
 BuildRequires:	xz >= 1:4.999.7
 Requires(post):	coreutils
-Requires(post):	geninitrd >= 12757-8
-Requires(post):	kmod >= 12-2
+Requires(post):	geninitrd >= 12787-6
+Requires(post):	kmod >= %{kmod_ver}
 Requires:	/sbin/depmod
 Requires:	coreutils
-Requires:	geninitrd >= 12757-8
-Requires:	kmod >= 12-2
+Requires:	geninitrd >= 12787-6
+Requires:	kmod >= %{kmod_ver}
 %if %{with pae}
 %ifarch i686 athlon pentium3 pentium4
 Requires:	cpuinfo(pae)
@@ -298,7 +304,7 @@ Conflicts:	udev < 1:081
 Conflicts:	util-linux < 2.10o
 Conflicts:	util-vserver < 0.30.216
 Conflicts:	xfsprogs < 2.6.0
-%if %{without pae}
+%if %{with pae}
 ExclusiveArch:	i686 pentium3 pentium4 athlon
 %else
 ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha arm ia64 ppc ppc64 sparc sparc64
@@ -699,6 +705,34 @@ sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:.%{alt_kernel}}#g' Makef
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
+find -name '*.py' -print0 | \
+	xargs -0 %{__sed} -i -e '1s,/usr/bin/python,%{__python},' \
+			     -e '1s,/usr/bin/env python,%{__python},' \
+			     -e '1s,/usr/bin/env python3,%{__python3},'
+
+%{__sed} -i -e '1s,/usr/bin/python,%{__python},' \
+	    -e '1s,/usr/bin/env python,%{__python},' \
+	    -e '1s,/usr/bin/env python3,%{__python3},' \
+	drivers/staging/greybus/tools/lbtest \
+	scripts/bloat-o-meter \
+	scripts/diffconfig \
+	scripts/jobserver-exec \
+	scripts/show_delta \
+	tools/hv/vmbus_testing \
+	tools/kvm/kvm_stat/kvm_stat
+
+find -name '*.pl' -print0 | \
+	xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
+
+%{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
+	scripts/dtc/dt_to_config \
+	scripts/cleanfile \
+	scripts/cleanpatch \
+	scripts/documentation-file-ref-check \
+	scripts/get_dvb_firmware \
+	scripts/kernel-doc \
+	scripts/stackdelta
+
 %build
 install -d %{objdir}
 cat > %{targetobj}.mk <<'EOF'
@@ -981,8 +1015,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
@@ -1242,8 +1276,6 @@ fi
 %if %{without rescuecd}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
 %endif
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
@@ -1273,6 +1305,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
@@ -1322,8 +1355,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 %if %{without rescuecd}
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/avm_cs.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %endif
 /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
@@ -1373,6 +1404,8 @@ fi
 %dir %{_kernelsrcdir}/security
 %dir %{_kernelsrcdir}/security/selinux
 %{_kernelsrcdir}/security/selinux/include
+%dir %{_kernelsrcdir}/usr
+%dir %{_kernelsrcdir}/usr/include
 %{_kernelsrcdir}/.config
 %{_kernelsrcdir}/Module.symvers
 
@@ -1396,8 +1429,11 @@ fi
 %{_kernelsrcdir}/scripts/kconfig/[c-k]*.c
 %{_kernelsrcdir}/scripts/kconfig/[c-k]*.h
 %{_kernelsrcdir}/scripts/kconfig/l*.h
-%{_kernelsrcdir}/scripts/kconfig/[m-u]*.c
-%{_kernelsrcdir}/scripts/kconfig/[m-u]*.h
+%{_kernelsrcdir}/scripts/kconfig/[m-o]*.c
+%{_kernelsrcdir}/scripts/kconfig/[m-o]*.h
+%{_kernelsrcdir}/scripts/kconfig/preprocess.c
+%{_kernelsrcdir}/scripts/kconfig/[q-u]*.c
+%{_kernelsrcdir}/scripts/kconfig/[q-u]*.h
 %{_kernelsrcdir}/scripts/kconfig/lxdialog
 %{_kernelsrcdir}/scripts/mod/*.c
 %{_kernelsrcdir}/scripts/mod/modpost.h
@@ -1426,7 +1462,6 @@ fi
 %{_docdir}/%{name}-%{version}/[!jkz]*
 %{_docdir}/%{name}-%{version}/[jkz]*.txt
 %{_docdir}/%{name}-%{version}/kbuild
-%{_docdir}/%{name}-%{version}/kdump
 %{_docdir}/%{name}-%{version}/kernel-hacking
 %endif
 
@@ -1441,6 +1476,7 @@ fi
 %{_kernelsrcdir}/arch/m68k/install.sh
 %{_kernelsrcdir}/arch/parisc/install.sh
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
+%{_kernelsrcdir}/arch/powerpc/kexec
 %{_kernelsrcdir}/arch/powerpc/kvm
 %ifarch ppc ppc64
 %exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
@@ -1457,7 +1493,6 @@ fi
 %{_kernelsrcdir}/certs
 %{_kernelsrcdir}/crypto
 %{_kernelsrcdir}/drivers
-%{_kernelsrcdir}/firmware
 %{_kernelsrcdir}/fs
 %{_kernelsrcdir}/init
 %{_kernelsrcdir}/ipc