From 251e4b012775cea61083516547e705cdb664819f Mon Sep 17 00:00:00 2001
From: Tasos Sahanidis <tasos@tasossah.com>
Date: Wed, 13 Mar 2024 20:25:31 +0200
Subject: core/linux-lts: Fix patching

---
 core/linux-lts/PKGBUILD | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'core/linux-lts')

diff --git a/core/linux-lts/PKGBUILD b/core/linux-lts/PKGBUILD
index 40554ed8..6e86230d 100644
--- a/core/linux-lts/PKGBUILD
+++ b/core/linux-lts/PKGBUILD
@@ -1,5 +1,3 @@
-# upstream git revision: d70c1e882bf3a02e734ec7f29f911ebb42912b8a
-
 # Don't bother with sha256sums, use blake2 only
 unset sha256sums
 
@@ -20,9 +18,8 @@ eval "$(
 
 # patch architecture when copying the kernel Makefile
 eval "$(
-  declare -f package_linux-headers | \
+  declare -f package_${pkgbase}-headers | \
     sed '
-      \,/tools/objtool" ,d
       \,arch/x86/Makefile, {
         a \
         install -t "${builddir}/arch/x86" -m644 arch/x86/Makefile_32.cpu
@@ -117,6 +114,14 @@ done
 source+=('no-ultra-zstd.patch')
 b2sums+=('e7915714b504b92155c983a30df6d97966c14520dc9eb004671003dbdecf454b061138a6d237cabe86be32ae2ea4c598cdb821cb1dd52f6a9bfe5e280bffa321')
 
+# objtool doesn't exist because we don't have STACK_VALIDATION
+# and resolve_btfids doesn't exist because we disable BTF due to pahole running out of memory
+eval "$(
+  declare -f package_${pkgbase}-headers | \
+    sed '/objtool/d' | \
+    sed '/resolve_btfids/d'
+)"
+
 # temporarily disabled documentation due to sphinx_rtd_theme (FS32#163)
 pkgname=(
   $(
-- 
cgit v1.2.3-70-g09d2