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

diff --git a/kernel.spec b/kernel.spec
index 404d8563..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		5.4
-%define		postver		.2
+%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
@@ -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:	ce9b2d974d27408a61c53a30d3f98fb9
+# Source0-md5:	7b9199ec5fa563ece9ed585ffb17798f
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	debad4bcc336d83f6bff88aed8384038
+# Patch0-md5:	914bdb8d023b52168272723c9c8eb678
 %endif
 Source1:	kernel.sysconfig
 
@@ -197,7 +197,7 @@ Patch101:	kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs5-standalone.git
 # cd aufs5-standalone
-# git checkout -b aufs5.2 origin/aufs5.2
+# 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-aufs5.patch
@@ -304,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
@@ -705,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'
@@ -1248,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/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,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/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*
@@ -1452,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.*