X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=42a2dbdd6ec069cba9bcfb9973a345deaab03c59;hb=a787acbcc368856640469bc41517d798449f541d;hp=2cdaf1d18846501930e72fd26f5a4b781a7c4600;hpb=d8663f3d3d5c96809cfce3e518d368996341253e;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 2cdaf1d..42a2dbd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -7,7 +7,13 @@
 %define		postver		83
 %define		rel		1
 
-%define		alt_kernel	6.1
+%define		__alt_kernel	%{nil}
+
+%if "%{__alt_kernel}" != ""
+%define		alt_kernel	%{__alt_kernel}
+%endif
+
+%define		versuffix	-%{basever}
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -20,7 +26,7 @@ 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
@@ -111,7 +117,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-
@@ -329,7 +335,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
@@ -342,14 +348,15 @@ 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.py
+	drivers/staging/greybus/tools/lbtest \
+	scripts/bloat-o-meter \
+	scripts/diffconfig \
+	scripts/dtc/dt-extract-compatibles \
+	scripts/jobserver-exec \
+	scripts/show_delta \
+	tools/hv/vmbus_testing \
+	tools/kvm/kvm_stat/kvm_stat \
+	tools/testing/selftests/exec/binfmt_script.py
 
 find -name '*.pl' -print0 | \
 	xargs -0 %{__sed} -i -e '1s,/usr/bin/env perl,%{__perl},' \
@@ -364,11 +371,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,' \
-	scripts/config
-
-%{__sed} -i -e '1s,/usr/bin/awk,/bin/awk,' \
-	scripts/ld-version.sh
+%{__sed} -i -e '1s,/usr/bin/env bash,%{__bash},' \
+	tools/testing/selftests/powerpc/security/mitigation-patching.sh \
+	scripts/config \
+	scripts/check-local-export
 
 %build
 install -d %{objdir}
@@ -555,13 +561,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