X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=2cb93f85fdf93b0ac8f14918baa6771c9db664ca;hb=83ae3efa84cc4259ee66c717d327d77ebac182bc;hp=5b9e43d08dd629e18216a0f11c46ba424b74991e;hpb=023b6606e13c0522b5048aac3832ee6cbde61d91;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 5b9e43d0..2cb93f85 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -41,11 +41,6 @@
 %{?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
 
@@ -57,7 +52,6 @@
 
 %if %{with myown}
 %define		have_drm	0
-%define		have_ide	0
 %define		have_sound	0
 %define		have_pcmcia	0
 %endif
@@ -72,8 +66,8 @@
 %endif
 
 %define		rel		1
-%define		basever		5.13
-%define		postver		.5
+%define		basever		6.0
+%define		postver		.3
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -123,11 +117,11 @@ Release:	%{rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5:	76c60fb304510a7bbd9c838790bc5fe4
+Source0:	https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
+# Source0-md5:	d681bd1d62d48049a4874646f6774d92
 %if "%{postver}" != ".0"
-Patch0:		https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Patch0-md5:	d8e0e95d439a5d37b3d4087c2b5411a6
+Patch0:		https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
+# Patch0-md5:	ad711c00bda19988c7d063851ab80c34
 %endif
 Source1:	kernel.sysconfig
 
@@ -146,6 +140,8 @@ Source22:	kernel-sparc.config
 Source23:	kernel-alpha.config
 Source24:	kernel-powerpc.config
 Source25:	kernel-ia64.config
+Source26:	kernel-arm.config
+Source27:	kernel-arm64.config
 
 Source41:	kernel-patches.config
 Source43:	kernel-vserver.config
@@ -217,8 +213,9 @@ Patch2003:	kernel-regressions.patch
 Patch7000:	kernel-inittmpfs.patch
 
 # ARM only
-Patch8000:	rpi-wm8804.patch
+Patch8000:	rpi-sound.patch
 Patch8001:	kernel-pinebook-pro.patch
+Patch8002:	atheros-disallow-retrain-nongen1-pcie.patch
 
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
@@ -227,30 +224,32 @@ Patch8001:	kernel-pinebook-pro.patch
 URL:		https://www.kernel.org/
 AutoReqProv:	no
 BuildRequires:	/sbin/depmod
-BuildRequires:	bc
-BuildRequires:	binutils >= 3:2.18
-BuildRequires:	bison
+BuildRequires:	bc >= 1.06.95
+BuildRequires:	binutils >= 3:2.23
+BuildRequires:	bison >= 2.0
 %ifarch sparc sparc64
 BuildRequires:	elftoaout
 %endif
 BuildRequires:	elfutils-devel
-BuildRequires:	flex
+BuildRequires:	flex >= 2.5.35
 BuildRequires:	gcc >= 6:7.2.0-6
 BuildRequires:	gcc-c++
 BuildRequires:	gcc-plugin-devel
 BuildRequires:	hostname
 BuildRequires:	kmod >= %{kmod_ver}
 BuildRequires:	libstdc++-devel
-BuildRequires:	openssl-devel
-BuildRequires:	openssl-tools
-BuildRequires:	perl-base
+BuildRequires:	make >= 1:3.81
+BuildRequires:	openssl-devel >= 1.0.0
+BuildRequires:	openssl-tools >= 1.0.0
+BuildRequires:	perl-base >= 5
 BuildRequires:	rpm-build >= 4.5-24
-BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	rpmbuild(macros) >= 2.019
 BuildRequires:	tar >= 1:1.22
 %ifarch ppc
 BuildRequires:	uboot-mkimage
 %endif
 BuildRequires:	xz >= 1:4.999.7
+BuildConflicts:	dwarves < 1.16
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 12787-6
 Requires(post):	kmod >= %{kmod_ver}
@@ -266,7 +265,7 @@ Requires:	cpuinfo(pae)
 Suggests:	crda
 Suggests:	dracut
 Suggests:	keyutils
-Requires:	linux-firmware
+Suggests:	linux-firmware
 Provides:	%{name}(netfilter) = 20070806
 Provides:	%{name}(vermagic) = %{kernel_release}
 Obsoletes:	kernel%{_alt_kernel}-char-lirc-ene0100 < 0.9.0
@@ -464,24 +463,6 @@ DRM Kernel Treiber.
 %description drm -l pl.UTF-8
 Sterowniki DRM.
 
-%package ide
-Summary:	IDE kernel modules
-Summary(de.UTF-8):	IDE Kernel Treiber
-Summary(pl.UTF-8):	Sterowniki IDE
-Group:		Base/Kernel
-Requires(postun):	%{name} = %{epoch}:%{version}-%{release}
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-AutoReqProv:	no
-
-%description ide
-IDE kernel modules.
-
-%description ide -l de.UTF-8
-IDE Kernel Treiber.
-
-%description ide -l pl.UTF-8
-Sterowniki IDE.
-
 %package pcmcia
 Summary:	PCMCIA modules
 Summary(de.UTF-8):	PCMCIA Module
@@ -552,7 +533,7 @@ Group:		Development/Building
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
 Requires:	elfutils-devel
 Requires:	make
-Conflicts:	rpmbuild(macros) < 1.704
+Conflicts:	rpmbuild(macros) < 2.019
 AutoReqProv:	no
 
 %description module-build
@@ -687,6 +668,7 @@ cd linux-%{basever}
 %ifarch %{arm} aarch64
 %patch8000 -p1
 %patch8001 -p1
+%patch8002 -p1
 %endif
 
 %if %{with rt}
@@ -729,7 +711,7 @@ find -name '*.py' -print0 | \
 	scripts/show_delta \
 	tools/hv/vmbus_testing \
 	tools/kvm/kvm_stat/kvm_stat \
-	tools/testing/selftests/exec/binfmt_script
+	tools/testing/selftests/exec/binfmt_script.py
 
 find -name '*.pl' -print0 | \
 	xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
@@ -745,7 +727,9 @@ find -name '*.pl' -print0 | \
 	scripts/stackdelta
 
 %{__sed} -i -e '1s,/usr/bin/env bash,%{__bash},' \
-	scripts/config
+	tools/testing/selftests/powerpc/security/mitigation-patching.sh \
+	scripts/config \
+	scripts/check-local-export
 
 %build
 install -d %{objdir}
@@ -909,6 +893,12 @@ BuildConfig() {
 %ifarch x32
 		CONFIG_BPF_PRELOAD=n
 %endif
+%if %{_ver_ge %(rpm -q --qf='%%{VERSION}' gcc) 12}
+		CONFIG_INIT_STACK_ALL_ZERO=y
+		CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=n
+%else
+		CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y
+%endif
 EOCONFIG
 
 %if %{with rescuecd}
@@ -954,8 +944,14 @@ cd -
 
 %{__awk} %{?debug:-v dieOnError=1} -v infile=%{objdir}/%{defconfig} -f %{SOURCE8} %{objdir}/.config
 
+%{__make} \
+	TARGETOBJ=%{targetobj} \
+	%{?with_verbose:V=1} \
+	scripts
+
 # build kernel
 export DTC_FLAGS=-@
+ICECC_EXTRAFILES="${ICECC_EXTRAFILES:+$ICECC_EXTRAFILES:}$(test -d %{objdir}/scripts/gcc-plugins && find %{objdir}/scripts/gcc-plugins -name '*.so' | paste -s -d :)"
 %{__make} \
 	TARGETOBJ=%{targetobj} \
 	%{?with_verbose:V=1} \
@@ -963,7 +959,7 @@ export DTC_FLAGS=-@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} modules_install \
+%{__make} %{MakeOpts} %{!?with_verbose:-s} modules_install \
 	-C %{objdir} \
 	%{?with_verbose:V=1} \
 	DEPMOD=%{DepMod} \
@@ -1137,6 +1133,11 @@ if [[ "$CREATE_SYMLINKS" != [Nn][Oo] ]]; then
 	mv -f /boot/System.map{,.old} 2> /dev/null
 	ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
 	ln -sf System.map-%{kernel_release} /boot/System.map
+%ifarch %{arm} aarch64
+	test -L /boot/dtb.old && rm /boot/dtb.old
+	test ! -e /boot/dtb.old && mv -f /boot/dtb{,.old} 2> /dev/null
+	ln -sf dtb-%{kernel_release} /boot/dtb
+%endif
 %if 0%{?alt_kernel:1}
 	mv -f /boot/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null
 	mv -f /boot/System%{_alt_kernel}.map{,.old} 2> /dev/null
@@ -1216,12 +1217,6 @@ fi
 %postun drm
 %depmod %{kernel_release}
 
-%post ide
-%depmod %{kernel_release}
-
-%postun ide
-%depmod %{kernel_release}
-
 %post pcmcia
 %depmod %{kernel_release}
 
@@ -1282,9 +1277,6 @@ fi
 %if %{have_drm}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu
 %endif
-%if %{have_ide}
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/*
-%endif
 /lib/modules/%{kernel_release}/kernel/fs
 /lib/modules/%{kernel_release}/kernel/kernel
 /lib/modules/%{kernel_release}/kernel/lib
@@ -1313,7 +1305,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.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*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/can/softing/softing_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c574_cs.ko*
@@ -1375,15 +1366,6 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/gpu
 %endif
 
-%if %{have_ide}
-%files ide
-%defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/ide/*
-%if %{have_pcmcia}
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
-%endif
-%endif
-
 %if %{have_pcmcia}
 %files pcmcia
 %defattr(644,root,root,755)
@@ -1394,7 +1376,6 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
 %endif
-/lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/arcnet/com20020_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/can/softing/softing_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/ethernet/3com/3c574_cs.ko*
@@ -1444,6 +1425,8 @@ fi
 %dir %{_kernelsrcdir}/security
 %dir %{_kernelsrcdir}/security/selinux
 %{_kernelsrcdir}/security/selinux/include
+%dir %{_kernelsrcdir}/tools
+%{_kernelsrcdir}/tools/include
 %dir %{_kernelsrcdir}/usr
 %dir %{_kernelsrcdir}/usr/include
 %{_kernelsrcdir}/.config
@@ -1477,8 +1460,8 @@ fi
 %{_kernelsrcdir}/scripts/kconfig/lxdialog
 %{_kernelsrcdir}/scripts/mod/*.c
 %{_kernelsrcdir}/scripts/mod/modpost.h
+%attr(755,root,root) %{_kernelsrcdir}/scripts/check-local-export
 %attr(755,root,root) %{_kernelsrcdir}/scripts/mkcompile_h
-%{_kernelsrcdir}/scripts/mkmakefile
 %attr(755,root,root) %{_kernelsrcdir}/scripts/setlocalversion
 %{_kernelsrcdir}/scripts/subarch.include
 %{_kernelsrcdir}/scripts/*.c
@@ -1516,6 +1499,7 @@ fi
 %{_kernelsrcdir}/arch/x86/ia32/[!M]*
 %{_kernelsrcdir}/arch/powerpc/kexec
 %{_kernelsrcdir}/arch/powerpc/kvm
+%{_kernelsrcdir}/arch/riscv/kvm
 %ifarch ppc ppc64
 %exclude %{_kernelsrcdir}/arch/powerpc/lib/crtsavres.*
 %endif
@@ -1532,6 +1516,7 @@ fi
 %{_kernelsrcdir}/drivers
 %{_kernelsrcdir}/fs
 %{_kernelsrcdir}/init
+%{_kernelsrcdir}/io_uring
 %{_kernelsrcdir}/ipc
 %{_kernelsrcdir}/kernel
 %exclude %{_kernelsrcdir}/kernel/bounds.c
@@ -1544,9 +1529,9 @@ fi
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include
 %exclude %{_kernelsrcdir}/scripts/Makefile*
 %exclude %{_kernelsrcdir}/scripts/basic
+%exclude %{_kernelsrcdir}/scripts/check-local-export
 %exclude %{_kernelsrcdir}/scripts/kconfig
 %exclude %{_kernelsrcdir}/scripts/mkcompile_h
-%exclude %{_kernelsrcdir}/scripts/mkmakefile
 %exclude %{_kernelsrcdir}/scripts/mod
 %exclude %{_kernelsrcdir}/scripts/setlocalversion
 %exclude %{_kernelsrcdir}/scripts/subarch.include
@@ -1565,6 +1550,7 @@ fi
 %{_kernelsrcdir}/security
 %exclude %{_kernelsrcdir}/security/selinux/include
 %{_kernelsrcdir}/tools/*
+%exclude %{_kernelsrcdir}/tools/include
 %ifarch %{x8664} x32
 %exclude %{_kernelsrcdir}/tools/objtool/fixdep
 %exclude %{_kernelsrcdir}/tools/objtool/objtool