summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-01-24 07:00:40 +0100
committerChristian Breunig <christian@breunig.cc>2026-01-24 07:07:22 +0100
commitb929786f031773756d99c28a1e468eacd8e3f6e7 (patch)
treefaaa57a8b9c28764fa410a0642ab253260d66b85 /scripts
parent5667462b8db072b90b01eb10938b5e31e45a5c15 (diff)
downloadvyos-build-b929786f031773756d99c28a1e468eacd8e3f6e7.tar.gz
vyos-build-b929786f031773756d99c28a1e468eacd8e3f6e7.zip
Kernel: T8203: update Linux Kernel to v6.6.121
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package-build/linux-kernel/package.toml2
-rw-r--r--scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch8
-rw-r--r--scripts/package-build/linux-kernel/patches/kernel/0004-perf-fix-compile.patch40
3 files changed, 46 insertions, 4 deletions
diff --git a/scripts/package-build/linux-kernel/package.toml b/scripts/package-build/linux-kernel/package.toml
index ea8a87f2..26a7dac3 100644
--- a/scripts/package-build/linux-kernel/package.toml
+++ b/scripts/package-build/linux-kernel/package.toml
@@ -110,8 +110,10 @@ packages = [
"ruby-dev",
"rubygems",
"build-essential",
+ "binutils-dev",
"libdw-dev",
"libunwind-dev",
+ "libdebuginfod-dev",
"systemtap-sdt-dev",
"libslang2-dev",
"python-dev-is-python3",
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
index 530dd549..945f5489 100644
--- a/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
+++ b/scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch
@@ -101,10 +101,10 @@ index 798497c8b192..0b4510b06ab5 100644
};
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index 0e49ee83533b..227e9e439fea 100644
+index 2737bb4751e4..dcf32b532598 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -5671,6 +5671,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
+@@ -5699,6 +5699,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;
array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;
@@ -112,7 +112,7 @@ index 0e49ee83533b..227e9e439fea 100644
}
static inline size_t inet6_ifla6_size(void)
-@@ -7115,6 +7116,13 @@ static const struct ctl_table addrconf_sysctl[] = {
+@@ -7143,6 +7144,13 @@ static const struct ctl_table addrconf_sysctl[] = {
.extra1 = (void *)SYSCTL_ZERO,
.extra2 = (void *)SYSCTL_ONE,
},
@@ -127,7 +127,7 @@ index 0e49ee83533b..227e9e439fea 100644
.procname = "ioam6_id",
.data = &ipv6_devconf.ioam6_id,
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index eb9e505f71f9..bdcbaf43bf6d 100644
+index ad452a04d729..b45e5e0fe8c4 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -716,6 +716,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
diff --git a/scripts/package-build/linux-kernel/patches/kernel/0004-perf-fix-compile.patch b/scripts/package-build/linux-kernel/patches/kernel/0004-perf-fix-compile.patch
new file mode 100644
index 00000000..dc3c2614
--- /dev/null
+++ b/scripts/package-build/linux-kernel/patches/kernel/0004-perf-fix-compile.patch
@@ -0,0 +1,40 @@
+From c660a5ee919f01e7c3269ea92baf13741c8aee17 Mon Sep 17 00:00:00 2001
+From: Christian Breunig <christian@breunig.cc>
+Date: Sat, 24 Jan 2026 07:06:05 +0100
+Subject: [PATCH] tools: fix implicit declaration of function cpu_to_le16
+
+After commit 64d86c03e1441742216b6332bdfabfb6ede31662 ("perf arm-spe: Extend
+branch operations") which was also backported to the stable branches, the
+restructuring caused a missing definition.
+
+tools/include/linux/bitops.h implement
+
+define __MAKE_OP(size) \
+ ____MAKE_OP(le##size,u##size,cpu_to_le##size,le##size##_to_cpu) \
+ ____MAKE_OP(be##size,u##size,cpu_to_be##size,be##size##_to_cpu) \
+ ____MAKE_OP(u##size,u##size,,)
+____MAKE_OP(u8,u8,,)
+
+but cpu_to_le## or cpu_to_be## are not defined.
+
+Fix by including linux/kernel.h.
+
+---
+ tools/include/linux/bitfield.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/include/linux/bitfield.h b/tools/include/linux/bitfield.h
+index 6093fa6db260..ddf81f24956b 100644
+--- a/tools/include/linux/bitfield.h
++++ b/tools/include/linux/bitfield.h
+@@ -8,6 +8,7 @@
+ #define _LINUX_BITFIELD_H
+
+ #include <linux/build_bug.h>
++#include <linux/kernel.h>
+ #include <asm/byteorder.h>
+
+ /*
+--
+2.39.5
+