X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel.spec;h=2845f2ef613d95d7b63c4cae05eeeb863c6a0411;hb=554391477d1f4d0d9fe0daf369c5aae91fb4c0bb;hp=2103d765278ac9610fbe0700294892ff783e116c;hpb=021855ccffbffed1b8a053d15027eb46d5da0d5e;p=packages%2Fkernel.git

diff --git a/kernel.spec b/kernel.spec
index 2103d76..2845f2e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,10 +4,16 @@
 %bcond_with	verbose		# verbose build (V=1)
 
 %define		basever		5.15
-%define		postver		153
+%define		postver		158
 %define		rel		1
 
-%define		alt_kernel	5.15
+%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
@@ -30,7 +36,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:	476b156815103c9eb936a03c130d3874
+# Source1-md5:	5b1dcbfc05b72def1f1658a27ad696e4
 %endif
 
 Source2:	kernel-module-build.pl
@@ -109,9 +115,9 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		topdir		%{_builddir}/%{name}-%{version}
 %define		srcdir		%{topdir}/linux-%{basever}
 %define		objdir		%{topdir}/%{targetobj}
-%define		targetobj	%{_target_base_arch}-gcc-%(%{kgcc} -dumpversion)
+%define		targetobj	%{_target_base_arch}-gcc-%(%{__cc} -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-
@@ -126,7 +132,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 	%define CrossOpts ARCH=%{_target_base_arch} CC="%{__cc}"
 	%define	DepMod /sbin/depmod
 %endif
-%define MakeOpts %{CrossOpts} HOSTCC="%{__cc}"
+# use 64-bit offsets for fixdeps to work with 64-bit inodes
+%define MakeOpts %{CrossOpts} HOSTCC="%{__cc} -D_FILE_OFFSET_BITS=64"
 
 %description
 This package contains the Linux kernel that is used to boot and run
@@ -329,7 +336,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 +349,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},' \
@@ -364,12 +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,' \
+%{__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'
@@ -555,13 +560,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