X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=b14b7193d07193b7afaa7e0d7d632ba2d9127571;hb=94bc29e2ff4f3c49253c0536c48cd2bf44ccfd4a;hp=f3ecd1e1e4e86d83a7aa580f76bcccc06bd4a4a5;hpb=b7b812e73bcf083a9803531751ecba25af64d6fa;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index f3ecd1e..b14b719 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,7 +4,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 
 %define		basever		5.15
-%define		postver		65
+%define		postver		153
 %define		rel		1
 
 %define		alt_kernel	5.15
@@ -13,7 +13,7 @@
 # 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)
@@ -30,7 +30,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz
 # Source0-md5:	071d49ff4e020d58c04f9f3f76d3b594
 %if "%{postver}" != "0"
 Source1:	http://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz
-# Source1-md5:	3e5c4f291808c2d94b4ed25f790b3424
+# Source1-md5:	476b156815103c9eb936a03c130d3874
 %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
@@ -351,14 +342,14 @@ find -name '*.py' -print0 | \
 %{__sed} -i -e '1s,/usr/bin/python$,%{__python},' \
 	-e '1s,/usr/bin/env python$,%{__python},' \
 	-e '1s,/usr/bin/env python3$,%{__python3},' \
-		drivers/staging/greybus/tools/lbtest \
-		scripts/bloat-o-meter \
-		scripts/diffconfig \
-		scripts/jobserver-exec \
-		scripts/show_delta \
-		tools/hv/vmbus_testing \
-		tools/kvm/kvm_stat/kvm_stat \
-		tools/testing/selftests/exec/binfmt_script
+	drivers/staging/greybus/tools/lbtest \
+	scripts/bloat-o-meter \
+	scripts/diffconfig \
+	scripts/jobserver-exec \
+	scripts/show_delta \
+	tools/hv/vmbus_testing \
+	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},' \
@@ -373,12 +364,10 @@ find -name '*.pl' -print0 | \
 	scripts/sphinx-pre-install \
 	scripts/stackdelta
 
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\\1,' \
+%{__sed} -i -e '1s,/usr/bin/env bash,%{__bash},' \
+	tools/testing/selftests/powerpc/security/mitigation-patching.sh \
 	scripts/config
 
-%{__sed} -i -e '1s,/usr/bin/awk,/bin/awk,' \
-	scripts/ld-version.sh
-
 %build
 install -d %{objdir}
 cat > %{targetobj}.mk <<'EOF'