X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=9b02a6b79aab2b04831a75beefd68826d0a24068;hb=37911694c18e98ccca063810b6ffffac91aeb306;hp=e6528989f55da3586cd0879118a56f26afe808a2;hpb=d58c55f2695154825b83f75e1487e00ceeccdc9f;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index e6528989..9b02a6b7 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
@@ -41,7 +41,11 @@
 %{?debug:%define with_verbose 1}
 
 %define		have_drm	1
+%ifarch %{ix86} %{x8664} x32 alpha %{arm} ia64 ppc ppc64 sparc sparc64
 %define		have_ide	1
+%else
+%define		have_ide	0
+%endif
 %define		have_sound	1
 %define		have_pcmcia	1
 
@@ -67,9 +71,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		5.5
-%define		postver		.0
+%define		rel		0.1
+%define		basever		5.8
+%define		postver		.1
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -93,8 +97,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 +124,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:	0a78b1dc48dc032fe505b170c1b92339
+# Source0-md5:	0e5c4c15266218ef26c50fac0016095b
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	bbb20c60fad075793e7a1be91051595e
+# Patch0-md5:	987e4b7b28558b51c769121637cef827
 %endif
 Source1:	kernel.sysconfig
 
@@ -197,7 +201,7 @@ Patch101:	kernel-vserver-fixes.patch
 # Patch creation:
 # git clone git://github.com/sfjro/aufs5-standalone.git
 # cd aufs5-standalone
-# git checkout -b aufs5.4 origin/aufs5.4
+# git checkout -b aufs5.8 origin/aufs5.8
 # 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
@@ -289,6 +293,7 @@ Obsoletes:	kernel-smp
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
+Conflicts:	libcap-libs < 1:2.34
 Conflicts:	libusb < 1.0.9
 Conflicts:	linux-firmware < 20120720
 Conflicts:	lvm2 < 2.02.40
@@ -304,10 +309,10 @@ 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
+ExclusiveArch:	i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha %{arm} ia64 ppc ppc64 sparc sparc64 aarch64
 %endif
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -323,7 +328,10 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %ifarch sparc sparc64
 %define		target_arch_dir		sparc
 %endif
-%ifnarch %{ix86} %{x8664} x32 ppc ppc64 sparc sparc64
+%ifarch aarch64
+%define		target_arch_dir		arm64
+%endif
+%ifnarch %{ix86} %{x8664} x32 ppc ppc64 sparc sparc64 aarch64
 %define		target_arch_dir		%{_target_base_arch}
 %endif
 
@@ -373,8 +381,12 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 	%ifarch ppc ppc64
 	%define CrossOpts ARCH=powerpc CC="%{__cc}"
 	%else
+	%ifarch aarch64
+	%define CrossOpts ARCH=arm64 CC="%{__cc}"
+	%else
 	%define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
 	%endif
+	%endif
 	%define	DepMod /sbin/depmod
 %endif
 # use 64-bit offsets for fixdeps to work with 64-bit inodes
@@ -719,7 +731,8 @@ find -name '*.py' -print0 | \
 	scripts/jobserver-exec \
 	scripts/show_delta \
 	tools/hv/vmbus_testing \
-	tools/kvm/kvm_stat/kvm_stat
+	tools/kvm/kvm_stat/kvm_stat \
+	tools/testing/selftests/exec/binfmt_script
 
 find -name '*.pl' -print0 | \
 	xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
@@ -952,6 +965,13 @@ rm -rf $RPM_BUILD_ROOT
 	INSTALL_MOD_PATH=$RPM_BUILD_ROOT \
 	KERNELRELEASE=%{kernel_release}
 
+%ifarch %{arm} aarch64
+%{__make} %{MakeOpts} %{!?with_verbose:-s} dtbs_install \
+	-C %{objdir} \
+	%{?with_verbose:V=1} \
+	INSTALL_DTBS_PATH=$RPM_BUILD_ROOT/boot/dtb-%{kernel_release}
+%endif
+
 install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/misc
 
 # create directories which may be missing, to simplyfy %files
@@ -1003,9 +1023,12 @@ cp -aL %{objdir}/.config $RPM_BUILD_ROOT/boot/config-%{kernel_release}
 		install -p %{objdir}/vmlinux.aout $RPM_BUILD_ROOT/boot/vmlinux.aout-%{kernel_release}
 	%endif
 %endif
-%ifarch arm
+%ifarch %{arm}
 	install -p %{objdir}/arch/arm/boot/zImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
 %endif
+%ifarch aarch64
+	cp -a %{objdir}/arch/%{target_arch_dir}/boot/Image.gz $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+%endif
 
 # ghosted initrd
 touch $RPM_BUILD_ROOT%{initrd_dir}/initrd-%{kernel_release}.gz
@@ -1079,7 +1102,6 @@ mv $RPM_BUILD_ROOT{%{_kernelsrcdir}/Documentation,%{_docdir}/%{name}-%{version}}
 
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/dontdiff
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/Makefile
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*/Makefile
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*/*/Makefile
 %else
 %{__rm} -r $RPM_BUILD_ROOT%{_kernelsrcdir}/Documentation
@@ -1235,6 +1257,9 @@ fi
 %ifarch ia64
 /boot/efi/vmlinuz-%{kernel_release}
 %endif
+%ifarch %{arm} aarch64
+/boot/dtb-%{kernel_release}
+%endif
 /boot/vmlinuz-%{kernel_release}
 /boot/System.map-%{kernel_release}
 /boot/config-%{kernel_release}
@@ -1266,6 +1291,7 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/pci/cx88/cx88-alsa.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/usb/em28xx/em28xx-alsa.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/pci/saa7134/saa7134-alsa.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/legacy/g_midi.ko*
 %endif
 %endif
 %dir /lib/modules/%{kernel_release}/misc
@@ -1276,9 +1302,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*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/arcnet/com20020_cs.ko*
@@ -1305,7 +1328,9 @@ fi
 /lib/modules/%{kernel_release}/kernel/sound
 %endif
 /lib/modules/%{kernel_release}/kernel/security
+%ifarch %{ix86} %{x8664} x32
 /lib/modules/%{kernel_release}/kernel/virt
+%endif
 
 %dir %{_sysconfdir}/depmod.d/%{kernel_release}
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
@@ -1357,8 +1382,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*
@@ -1420,6 +1443,7 @@ fi
 %endif
 %exclude %dir %{_kernelsrcdir}/arch/um
 %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
+%{_kernelsrcdir}/arch/*/kernel/module.lds
 %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
 %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h
 %{_kernelsrcdir}/kernel/bounds.c
@@ -1480,16 +1504,17 @@ 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.*
 %endif
-%{_kernelsrcdir}/arch/arm/kvm
 %{_kernelsrcdir}/arch/arm64/kvm
 %{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm
 %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
+%exclude %{_kernelsrcdir}/arch/*/kernel/module.lds
 %exclude %{_kernelsrcdir}/arch/*/kernel/sigframe*.h
 %exclude %{_kernelsrcdir}/drivers/media/pci/bt8xx/bttv.h
 %{_kernelsrcdir}/block