X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=5da2ec9da12a3162c21274f18e7fe3f375241d69;hb=a3896f0b8222349cadb4ca8eca1174eab9f6ca9e;hp=bb18dad271b6e395aa8408d657b0067753df2514;hpb=9772a68e6c87f20a6f9b0181e87195bc664f3b60;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index bb18dad..5da2ec9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -3,11 +3,11 @@
 %bcond_without	doc		# don't build kernel-doc package
 %bcond_with	verbose		# verbose build (V=1)
 
-%define		basever		5.10
-%define		postver		109
-%define		rel		1
+%define		basever		6.1
+%define		postver		64
+%define		rel		0.1
 
-%define		alt_kernel	5.10
+%define		alt_kernel	6.1
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -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:	753adc474bf799d569dec4f165ed92c3
+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:	eb1e3841c0ce05b8630754bcbddb8f74
+Source1:	http://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
+# Source1-md5:	a69d10e6f44ad8bfc9badf97ba93c718
 %endif
 
 Source2:	kernel-module-build.pl
@@ -157,6 +157,7 @@ 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.
@@ -175,6 +176,7 @@ 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
@@ -194,6 +196,7 @@ 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
@@ -215,6 +218,7 @@ 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
@@ -232,6 +236,7 @@ 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
@@ -254,6 +259,7 @@ 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
 
@@ -275,6 +281,7 @@ 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
@@ -305,6 +312,7 @@ 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
@@ -350,7 +358,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},' \
@@ -607,7 +615,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/*/pcmcia
 %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/ide/ide-cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/parport/parport_cs.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/tty/serial/8250/serial_cs.ko*
@@ -650,7 +657,6 @@ fi
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
 /lib/modules/%{kernel_release}/kernel/drivers/bluetooth/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/ata/pata_pcmcia.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/ide/ide-cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/net/wireless/*_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/parport/parport_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/tty/serial/8250/serial_cs.ko*
@@ -707,7 +713,6 @@ fi
 %{_kernelsrcdir}/scripts/mod/*.c
 %{_kernelsrcdir}/scripts/mod/modpost.h
 %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
@@ -768,7 +773,6 @@ fi
 %exclude %{_kernelsrcdir}/scripts/basic
 %exclude %{_kernelsrcdir}/scripts/kconfig
 %exclude %{_kernelsrcdir}/scripts/mkcompile_h
-%exclude %{_kernelsrcdir}/scripts/mkmakefile
 %exclude %{_kernelsrcdir}/scripts/mod
 %exclude %{_kernelsrcdir}/scripts/setlocalversion
 %exclude %{_kernelsrcdir}/scripts/*.c