[patch] Latest patch after review

0001-kernel-2.eclass-Fix-tmp_gas_check-for-ppc.patch (text/plain), 1.52 KB, created by Mike Pagano on 2021-09-06 19:12:37 UTC

From 23a5b54dac49bf9f5c0c805c6a8d0d45a65d1426 Mon Sep 17 00:00:00 2001
From: Mike Pagano <[e-mail]>
Date: Mon, 6 Sep 2021 15:09:09 -0400
Subject: [PATCH] kernel-2.eclass : Fix tmp_gas_check for ppc
Cc: [e-mail]

Bug: https://bugs.gentoo.org/336732

Signed-off-by: Mike Pagano <[e-mail]>
---
 eclass/kernel-2.eclass | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index ef70e250c1..18c91c3bc8 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1449,17 +1449,14 @@ kernel-2_src_unpack() {
 	fi
 
 	# fix a problem on ppc where TOUT writes to /usr/src/linux breaking sandbox
-	# only do this for kernel < 2.6.27 since this file does not exist in later
-	# kernels
-	if [[ -n ${KV_MINOR} ]] && ver_test ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} -lt 2.6.27; then
-		sed -i \
-			-e 's|TOUT      := .tmp_gas_check|TOUT  := $(T).tmp_gas_check|' \
-			"${S}"/arch/ppc/Makefile
-	else
-		sed -i \
-			-e 's|TOUT      := .tmp_gas_check|TOUT  := $(T).tmp_gas_check|' \
-			"${S}"/arch/powerpc/Makefile
-	fi
+	# only do this for kernels < 4.14.120 since this file does not exist in
+	# later kernels
+	local ppc_makefile="${S}"/arch/powerpc/Makefile
+	[[ -n ${KV_MINOR} ]] && ver_test ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} -lt 4.14.120  && \
+		ppc_makefile="${S}"/arch/ppc/Makefile
+	sed -i \
+		-e 's|^\(TOUT.*:= \)\(\.tmp_gas_check\)|\1$(addsuffix /,$(T))\2|' \
+		"${ppc_makefile}"
 }
 
 # @FUNCTION: kernel-2_src_prepare
-- 
2.32.0