X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=3a5b943e5f48a8fd2a81d9d06bbcdd1dc597c93b;hb=cb5482078ce119fdacc48ec8111385f0b283946a;hp=c014ad99a1cff7c5e7ad0c51f1ea74e5a2755b16;hpb=f6f51cf022efcdcb2862f0718ba1a4679d6d8092;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index c014ad99..3a5b943e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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
 
@@ -68,8 +72,8 @@
 %endif
 
 %define		rel		1
-%define		basever		5.6
-%define		postver		.1
+%define		basever		5.9
+%define		postver		.14
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -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:	7b9199ec5fa563ece9ed585ffb17798f
+# Source0-md5:	0959d759fd19e146367221aff504ad91
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	e59edecce5fb2839c9951ab8dad50e48
+# Patch0-md5:	d7f9892b339f14f5d2afa6bfb842b1f4
 %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
@@ -216,12 +220,14 @@ Patch500:	kernel-rt.patch
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.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
 Patch7000:	kernel-inittmpfs.patch
 
+# ARM only
+Patch8000:	rpi-wm8804.patch
+
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
 #Patch50000:	kernel-usb_reset.patch
@@ -244,6 +250,7 @@ BuildRequires:	hostname
 BuildRequires:	kmod >= %{kmod_ver}
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel
+BuildRequires:	openssl-tools
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.5-24
 BuildRequires:	rpmbuild(macros) >= 1.743
@@ -289,6 +296,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
@@ -307,7 +315,7 @@ Conflicts:	xfsprogs < 2.6.0
 %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 +331,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 +384,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
@@ -443,6 +458,7 @@ Summary(pl.UTF-8):	Sterowniki DRM
 Group:		Base/Kernel
 Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Provides:	kernel(vboxvideo) = %{kernel_release}
 Obsoletes:	kernel-smp-drm
 AutoReqProv:	no
 
@@ -679,6 +695,10 @@ cd linux-%{basever}
 %patch7000 -p1
 %endif
 
+%ifarch %{arm} aarch64
+%patch8000 -p1
+%endif
+
 %if %{with rt}
 %patch500 -p1
 rm -f localversion-rt
@@ -692,7 +712,6 @@ rm -f localversion-rt
 %patch2000 -p1
 %patch2001 -p1
 #%patch2003 -p1
-%patch2004 -p1
 
 # Do not remove this, please!
 #%%patch50000 -p1
@@ -719,7 +738,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 +972,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 +1030,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 +1109,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 +1264,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 +1298,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,7 +1309,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/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*
@@ -1303,7 +1335,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}
@@ -1416,6 +1450,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
@@ -1460,7 +1495,6 @@ fi
 %dir %{_docdir}/%{name}-%{version}
 
 %{_docdir}/%{name}-%{version}/[!jkz]*
-%{_docdir}/%{name}-%{version}/[jkz]*.txt
 %{_docdir}/%{name}-%{version}/kbuild
 %{_docdir}/%{name}-%{version}/kernel-hacking
 %endif
@@ -1481,12 +1515,12 @@ fi
 %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