summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathon Fernyhough2022-10-16 22:06:10 +0100
committerJonathon Fernyhough2022-10-16 22:07:21 +0100
commitafbe3c77eba4f8062f1f0c05a4d020e4875944aa (patch)
tree4a55ae2c06fdaa08581bbf9cac3f70b15f298780
parentc879b24ce2e79ee2a56c598f968cea6c09e79029 (diff)
downloadaur-afbe3c77eba4f8062f1f0c05a4d020e4875944aa.tar.gz
Fix build for newer pahole. Thanks ozz!
-rw-r--r--.SRCINFO4
-rw-r--r--0002-add_skip_encoding_bpf_enum64_option_to_pahole.patch11
-rw-r--r--PKGBUILD6
3 files changed, 18 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d9070646238c..d992bc8d1ccf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linux-lts510
pkgdesc = LTS 5.10 Linux
pkgver = 5.10.148
- pkgrel = 1
+ pkgrel = 2
url = https://www.kernel.org/
arch = x86_64
license = GPL2
@@ -24,12 +24,14 @@ pkgbase = linux-lts510
source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.148.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ source = 0002-add_skip_encoding_bpf_enum64_option_to_pahole.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = 12523f6be221067094ec541b196bce70493f7f44f031b3c4711d82e290c6e956
sha256sums = SKIP
sha256sums = 2367f59976f6fc902d226229564a98f5d1df3a91e742a292c3deccc3e4a8ffc0
sha256sums = 96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e
+ sha256sums = 7bb98f326314557afb158902c5eec8e0e42cf3f973ddffe78e1850f0309dd780
pkgname = linux-lts510
pkgdesc = The LTS 5.10 Linux kernel and modules
diff --git a/0002-add_skip_encoding_bpf_enum64_option_to_pahole.patch b/0002-add_skip_encoding_bpf_enum64_option_to_pahole.patch
new file mode 100644
index 000000000000..0cb524229ec6
--- /dev/null
+++ b/0002-add_skip_encoding_bpf_enum64_option_to_pahole.patch
@@ -0,0 +1,11 @@
+--- a/scripts/link-vmlinux.sh
++++ b/scripts/link-vmlinux.sh
+@@ -161,7 +161,7 @@
+ vmlinux_link ${1}
+
+ info "BTF" ${2}
+- LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1}
++ LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} --skip_encoding_btf_enum64 -J ${1}
+
+ # Create ${2} which contains just .BTF section but no symbols. Add
+ # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all
diff --git a/PKGBUILD b/PKGBUILD
index de38d15e3062..13d69ca59085 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=linux-lts510
pkgver=5.10.148
-pkgrel=1
+pkgrel=2
pkgdesc='LTS 5.10 Linux'
url="https://www.kernel.org/"
arch=(x86_64)
@@ -18,6 +18,7 @@ source=(
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
config # the main kernel config file
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+ 0002-add_skip_encoding_bpf_enum64_option_to_pahole.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -27,7 +28,8 @@ validpgpkeys=(
sha256sums=('12523f6be221067094ec541b196bce70493f7f44f031b3c4711d82e290c6e956'
'SKIP'
'2367f59976f6fc902d226229564a98f5d1df3a91e742a292c3deccc3e4a8ffc0'
- '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e')
+ '96a72e1652314215da7140956c3abcf495cafd00811eda3cf4ce03ec5f791f1e'
+ '7bb98f326314557afb158902c5eec8e0e42cf3f973ddffe78e1850f0309dd780')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase