- drop kernel-vanilla stuff, fix alt_kernel version for rpm.org

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index d937e8e4abad0c6419a8218eabdc3d92c5d17ad9..2cdaf1d18846501930e72fd26f5a4b781a7c4600 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -3,17 +3,17 @@
 %bcond_without doc             # don't build kernel-doc package
 %bcond_with    verbose         # verbose build (V=1)
 
-%define                basever         5.15
-%define                postver         92
+%define                basever         6.1
+%define                postver         83
 %define                rel             1
 
-%define                alt_kernel      5.15
+%define                alt_kernel      6.1
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
 # localversion is just that without version for "> localversion"
 %define                localversion    %{rel}
-%define                kernel_release  %{version}%{?alt_kernel:-%{alt_kernel}}-%{localversion}
+%define                kernel_release  %{version}%{?alt_kernel:_%{alt_kernel}}-%{localversion}
 
 Summary:       The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):     Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -26,11 +26,11 @@ Release:    %{rel}
 Epoch:         3
 License:       GPL v2
 Group:         Base/Kernel
-Source0:       http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
-# Source0-md5: 071d49ff4e020d58c04f9f3f76d3b594
+Source0:       http://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
+# Source0-md5: 475320de08f16c9fa486fc4edfe98b30
 %if "%{postver}" != "0"
-Source1:       http://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Source1-md5: 80f36769a52316112e743635c82b8f07
+Source1:       http://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
+# Source1-md5: 7dfd57b75a1d01e25919767dacfd8251
 %endif
 
 Source2:       kernel-module-build.pl
@@ -69,7 +69,6 @@ Suggests:     keyutils
 Suggests:      linux-firmware
 Provides:      %{name}(netfilter) = 20070806
 Provides:      %{name}(vermagic) = %{kernel_release}
-Obsoletes:     kernel%{_alt_kernel}-vanilla
 Obsoletes:     kernel-firmware
 Obsoletes:     kernel-modules
 Conflicts:     e2fsprogs < 1.29
@@ -157,7 +156,6 @@ Summary(de.UTF-8):  vmlinux - dekompressiertes Kernel Bild
 Summary(pl.UTF-8):     vmlinux - rozpakowany obraz jądra
 Group:         Base/Kernel
 Obsoletes:     kernel-smp-vmlinux
-Obsoletes:     kernel%{_alt_kernel}-vanilla-vmlinux
 
 %description vmlinux
 vmlinux - uncompressed kernel image.
@@ -176,7 +174,6 @@ Group:              Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     kernel-smp-drm
-Obsoletes:     kernel%{_alt_kernel}-vanilla-drm
 AutoReqProv:   no
 
 %description drm
@@ -196,7 +193,6 @@ Group:              Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     kernel-smp-pcmcia
-Obsoletes:     kernel%{_alt_kernel}-vanilla-pcmcia
 Conflicts:     pcmcia-cs < 3.1.21
 Conflicts:     pcmciautils < 004
 AutoReqProv:   no
@@ -218,7 +214,6 @@ Group:              Base/Kernel
 Requires(postun):      %{name} = %{epoch}:%{version}-%{release}
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     kernel-smp-sound-alsa
-Obsoletes:     kernel%{_alt_kernel}-vanilla-sound-alsa
 AutoReqProv:   no
 
 %description sound-alsa
@@ -236,7 +231,6 @@ Summary(de.UTF-8):  Header Dateien für den Linux-Kernel
 Summary(pl.UTF-8):     Pliki nagłówkowe jądra Linuksa
 Group:         Development/Building
 Provides:      %{name}-headers(netfilter) = 20070806
-Obsoletes:     kernel%{_alt_kernel}-vanilla-headers
 AutoReqProv:   no
 
 %description headers
@@ -259,7 +253,6 @@ Summary(de.UTF-8):  Development Dateien die beim Kernel Modul kompilationen gebra
 Summary(pl.UTF-8):     Pliki służące do budowania modułów jądra
 Group:         Development/Building
 Requires:      %{name}-headers = %{epoch}:%{version}-%{release}
-Obsoletes:     kernel%{_alt_kernel}-vanilla-module-build
 Conflicts:     rpmbuild(macros) < 1.652
 AutoReqProv:   no
 
@@ -281,7 +274,6 @@ Summary(de.UTF-8):  Der Kernel Quelltext
 Summary(pl.UTF-8):     Kod źródłowy jądra Linuksa
 Group:         Development/Building
 Requires:      %{name}-module-build = %{epoch}:%{version}-%{release}
-Obsoletes:     kernel%{_alt_kernel}-vanilla-source
 AutoReqProv:   no
 
 %description source
@@ -312,7 +304,6 @@ Summary:    Kernel documentation
 Summary(de.UTF-8):     Kernel Dokumentation
 Summary(pl.UTF-8):     Dokumentacja do jądra Linuksa
 Group:         Documentation
-Obsoletes:     kernel%{_alt_kernel}-vanilla-doc
 AutoReqProv:   no
 
 %description doc
@@ -358,7 +349,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},' \
@@ -748,6 +739,7 @@ fi
 %{_kernelsrcdir}/arch/mips/kvm
 %{_kernelsrcdir}/arch/powerpc/kexec
 %{_kernelsrcdir}/arch/powerpc/kvm
+%{_kernelsrcdir}/arch/riscv/kvm
 %{_kernelsrcdir}/arch/s390/kvm
 %{_kernelsrcdir}/arch/x86/kvm
 %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
@@ -759,6 +751,7 @@ fi
 %{_kernelsrcdir}/drivers
 %{_kernelsrcdir}/fs
 %{_kernelsrcdir}/init
+%{_kernelsrcdir}/io_uring
 %{_kernelsrcdir}/ipc
 %{_kernelsrcdir}/kernel
 %exclude %{_kernelsrcdir}/kernel/bounds.c
@@ -766,6 +759,7 @@ fi
 %{_kernelsrcdir}/mm
 %{_kernelsrcdir}/net
 %{_kernelsrcdir}/virt
+%{_kernelsrcdir}/rust
 %{_kernelsrcdir}/samples
 %{_kernelsrcdir}/scripts/*
 %exclude %{_kernelsrcdir}/scripts/Kbuild.include