diff options
Diffstat (limited to 'scripts/package-build/linux-kernel/patches/kernel')
2 files changed, 79 insertions, 14 deletions
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0004-l2tp-defer-route-at-tunnel-create.patch b/scripts/package-build/linux-kernel/patches/kernel/0004-l2tp-defer-route-at-tunnel-create.patch index b19a57e8..1020869e 100644 --- a/scripts/package-build/linux-kernel/patches/kernel/0004-l2tp-defer-route-at-tunnel-create.patch +++ b/scripts/package-build/linux-kernel/patches/kernel/0004-l2tp-defer-route-at-tunnel-create.patch @@ -30,10 +30,15 @@ Assisted-by: Cursor:claude-4.8-opus Signed-off-by: Christian Breunig <christian@breunig.cc> --- -diff --git i/net/l2tp/l2tp_core.c w/net/l2tp/l2tp_core.c -index 9156a937334a..6fd9c1d89533 100644 ---- i/net/l2tp/l2tp_core.c -+++ w/net/l2tp/l2tp_core.c + net/l2tp/l2tp_core.c | 65 +++++++++++++++++++++++- + net/l2tp/l2tp_ip.c | 37 ++++++++++++++ + net/l2tp/l2tp_ip6.c | 117 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 218 insertions(+), 1 deletion(-) + +diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c +index fd78928e9be2..0be01b28b7a8 100644 +--- a/net/l2tp/l2tp_core.c ++++ b/net/l2tp/l2tp_core.c @@ -55,6 +55,8 @@ #include <net/inet_ecn.h> #include <net/ip6_route.h> @@ -43,7 +48,7 @@ index 9156a937334a..6fd9c1d89533 100644 #include <asm/byteorder.h> #include <linux/atomic.h> -@@ -1453,6 +1455,67 @@ static void l2tp_tunnel_del_work(struct work_struct *work) +@@ -1454,6 +1456,67 @@ static void l2tp_tunnel_del_work(struct work_struct *work) * These sockets are freed when the namespace exits using the pernet * exit hook. */ @@ -111,7 +116,7 @@ index 9156a937334a..6fd9c1d89533 100644 static int l2tp_tunnel_sock_create(struct net *net, u32 tunnel_id, u32 peer_tunnel_id, -@@ -1490,7 +1553,7 @@ static int l2tp_tunnel_sock_create(struct net *net, +@@ -1491,7 +1554,7 @@ static int l2tp_tunnel_sock_create(struct net *net, udp_conf.local_udp_port = htons(cfg->local_udp_port); udp_conf.peer_udp_port = htons(cfg->peer_udp_port); @@ -120,10 +125,10 @@ index 9156a937334a..6fd9c1d89533 100644 if (err < 0) goto out; -diff --git i/net/l2tp/l2tp_ip.c w/net/l2tp/l2tp_ip.c -index 29795d2839e8..d63b00f09421 100644 ---- i/net/l2tp/l2tp_ip.c -+++ w/net/l2tp/l2tp_ip.c +diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c +index 29795d2839e8..0d904a50b9a3 100644 +--- a/net/l2tp/l2tp_ip.c ++++ b/net/l2tp/l2tp_ip.c @@ -24,6 +24,7 @@ #include <net/xfrm.h> #include <net/net_namespace.h> @@ -182,10 +187,10 @@ index 29795d2839e8..d63b00f09421 100644 if (rc < 0) goto out_sk; -diff --git i/net/l2tp/l2tp_ip6.c w/net/l2tp/l2tp_ip6.c -index ea232f338dcb..610e666c0a58 100644 ---- i/net/l2tp/l2tp_ip6.c -+++ w/net/l2tp/l2tp_ip6.c +diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c +index ea232f338dcb..e4e34db4c37f 100644 +--- a/net/l2tp/l2tp_ip6.c ++++ b/net/l2tp/l2tp_ip6.c @@ -28,6 +28,8 @@ #include <net/transp_v6.h> #include <net/addrconf.h> @@ -324,3 +329,6 @@ index ea232f338dcb..610e666c0a58 100644 if (rc < 0) goto out_sk; +-- +2.39.5 + diff --git a/scripts/package-build/linux-kernel/patches/kernel/0005-arm64-fix-relative-syscalltbl-path-in-Makefile.sysc.patch b/scripts/package-build/linux-kernel/patches/kernel/0005-arm64-fix-relative-syscalltbl-path-in-Makefile.sysc.patch new file mode 100644 index 00000000..8bccf3b2 --- /dev/null +++ b/scripts/package-build/linux-kernel/patches/kernel/0005-arm64-fix-relative-syscalltbl-path-in-Makefile.sysc.patch @@ -0,0 +1,57 @@ +From: Christian Breunig <christian@breunig.cc> +Date: Sat, 18 Jul 2026 18:30:00 +0000 +Subject: [PATCH] arm64: fix relative syscalltbl path in Makefile.syscalls + +Building the "linux-perf" Debian package (added by +0002-build-linux-perf-package.patch, via install_perf() invoking +"make -C tools/perf ... install") reproducibly fails on an arm64 build +host with: + + make[9]: *** No rule to make target + '.../tools/perf/libperf/arch/arm64/include/generated/uapi/asm/unistd_64.h'. + Stop. + +Root cause: tools/lib/perf/Makefile's "uapi-asm-generic:" recipe invokes +scripts/Makefile.asm-headers without "-C $(srctree)", so it inherits +whatever working directory tools/lib/perf/Makefile itself was invoked +with - which is tools/lib/perf/, not the kernel source root. This is +harmless for the generic default: + + syscalltbl := $(srctree)/scripts/syscall.tbl + +...which is absolute and thus resolves correctly regardless of the +working directory. arch/arm64/kernel/Makefile.syscalls, however, +overrides this with a relative path: + + syscalltbl = arch/arm64/tools/syscall_%.tbl + +When SRCARCH=arm64 (true both for the target kernel and, on a native +arm64 build host, for tools/perf's own build), this relative path is +looked up relative to tools/lib/perf/ instead of the kernel root, does +not exist there, and the "unistd_%.h" pattern rule that depends on it +can no longer be matched - so make reports no rule for the target at +all, rather than a missing-prerequisite error. + +This only surfaces on a native arm64 build host: on x86_64 hosts (the +common case for cross-building arm64 kernels) tools/perf builds for the +x86_64 host architecture, which has no such override and always uses +the safe, absolute default path. + +Fix by making arm64's override absolute too, matching the default and +every other reference in this file's callers. +--- + arch/arm64/kernel/Makefile.syscalls | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/kernel/Makefile.syscalls b/arch/arm64/kernel/Makefile.syscalls +index 0542a718871a..958f2335ec1b 100644 +--- a/arch/arm64/kernel/Makefile.syscalls ++++ b/arch/arm64/kernel/Makefile.syscalls +@@ -3,4 +3,4 @@ + syscall_abis_32 += + syscall_abis_64 += renameat rlimit memfd_secret + +-syscalltbl = arch/arm64/tools/syscall_%.tbl ++syscalltbl = $(srctree)/arch/arm64/tools/syscall_%.tbl +-- +2.39.5 |