- reworked kernel configuration

[packages/kernel.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 0bda6c7568b214455074c9ed9be644eae6094f04..3513bbb2c54a2b1f779bb7cfa2a42eee8d2e85c6 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,23 +4,25 @@
 %bcond_with    verbose         # verbose build (V=1)
 
 %define                basever         5.10
-%define                postver         188
+%define                postver         214
 %define                rel             1
 
-%define                alt_kernel      5.10
+%define                alt_kernel      %{nil}
+
+%define                versuffix       -%{basever}
 
 # 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)
 Summary(et.UTF-8):     Linuxi kernel (ehk operatsioonisüsteemi tuum)
 Summary(fr.UTF-8):     Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):     Jądro Linuksa
-Name:          kernel%{_alt_kernel}
+Name:          kernel%{versuffix}%{_alt_kernel}
 Version:       %{basever}.%{postver}
 Release:       %{rel}
 Epoch:         3
@@ -30,7 +32,7 @@ Source0:      http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5: 753adc474bf799d569dec4f165ed92c3
 %if "%{postver}" != "0"
 Source1:       http://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Source1-md5: c4e619db077bd092f082d89857deb221
+# Source1-md5: a519e0b21c58c5e215ecd7435caf22ab
 %endif
 
 Source2:       kernel-module-build.pl
@@ -69,7 +71,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
@@ -112,7 +113,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                objdir          %{topdir}/%{targetobj}
 %define                targetobj       %{_target_base_arch}-gcc-%(%{kgcc} -dumpversion)
 
-%define                _kernelsrcdir   /usr/src/linux%{_alt_kernel}-%{version}
+%define                _kernelsrcdir   /usr/src/linux%{versuffix}%{_alt_kernel}-%{version}
 
 %if "%{_target_base_arch}" != "%{_host_base_arch}"
        %define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-tld-linux-
@@ -157,7 +158,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 +176,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 +195,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 +216,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 +233,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 +255,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 +276,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 +306,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
@@ -338,7 +331,7 @@ cd linux-%{basever}
 %endif
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:-%{alt_kernel}}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{?alt_kernel:_%{alt_kernel}}#g' Makefile
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -564,13 +557,13 @@ fi
 %depmod %{kernel_release}
 
 %post headers
-ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_alt_kernel}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{versuffix}%{_alt_kernel}
 
 %postun headers
 if [ "$1" = "0" ]; then
-       if [ -L %{_prefix}/src/linux%{_alt_kernel} ]; then
-               if [ "$(readlink %{_prefix}/src/linux%{_alt_kernel})" = "linux%{_alt_kernel}-%{version}" ]; then
-                       rm -f %{_prefix}/src/linux%{_alt_kernel}
+       if [ -L %{_prefix}/src/linux%{versuffix}%{_alt_kernel} ]; then
+               if [ "$(readlink %{_prefix}/src/linux%{versuffix}%{_alt_kernel})" = "linux%{versuffix}%{_alt_kernel}-%{version}" ]; then
+                       rm -f %{_prefix}/src/linux%{versuffix}%{_alt_kernel}
                fi
        fi
 fi