X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=24fa8dc258b02b0efb299b5e254aecb8fafa06f8;hb=9aaf4872b9821bf35b2c6c6a4e745a85453d9b57;hp=b8e3abf04c3437beeaf5027881f073b77b1e43f9;hpb=7543edb34e1fd91a21be649f9206c70e5a14fb99;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index b8e3abf0..24fa8dc2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,12 +67,12 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		0.1
-%define		basever		5.2
-%define		postver		.0
+%define		rel		1
+%define		basever		5.4
+%define		postver		.100
 
 # 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)
@@ -120,10 +120,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:	ddf994de00d7b18395886dd9b30b9262
+# Source0-md5:	ce9b2d974d27408a61c53a30d3f98fb9
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	aed4686410e23561f67f5c512d0a6245
+# Patch0-md5:	2aff26b3e0e2efded5f878deea75aa8c
 %endif
 Source1:	kernel.sysconfig
 
@@ -193,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
@@ -246,17 +246,17 @@ 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):	geninitrd >= 12787-6
 Requires(post):	kmod >= %{kmod_ver}
 Requires:	/sbin/depmod
 Requires:	coreutils
-Requires:	geninitrd >= 12757-8
+Requires:	geninitrd >= 12787-6
 Requires:	kmod >= %{kmod_ver}
 %if %{with pae}
 %ifarch i686 athlon pentium3 pentium4
@@ -705,6 +705,32 @@ 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/show_delta \
+	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'
@@ -1248,8 +1274,8 @@ 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/staging/isdn/avm/avm_cs.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/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*
@@ -1329,8 +1355,8 @@ 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/staging/isdn/avm/avm_cs.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/staging/isdn/avm/b1pcmcia.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %endif
 /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
@@ -1380,6 +1406,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
 
@@ -1436,7 +1464,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