diff options
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index c1d27ce5..d00c35dd 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta" vyos_branch = "sagitta" release_train = "sagitta" -kernel_version = "6.6.30" +kernel_version = "6.6.31" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/docker/Dockerfile b/docker/Dockerfile index 21d4baa8..b7b152e7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -192,7 +192,9 @@ RUN wget https://salsa.debian.org/klausenbusk-guest/debootstrap/commit/a9a603b17 # Packages needed for Linux Kernel # gnupg2 is required by Jenkins for the TAR verification +# cmake required by accel-ppp RUN apt-get update && apt-get install -y \ + cmake \ gnupg2 \ rsync \ libelf-dev \ diff --git a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch index 2e9b4dd6..af67ef5c 100644 --- a/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch +++ b/packages/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch @@ -100,7 +100,7 @@ index bc74f131fe4d..9cdd5b50f9b2 100644 }; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index d1806eee1687..b4893d713b8c 100644 +index 9dfbda164e8c..2786c8ea451a 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5656,6 +5656,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, @@ -111,7 +111,7 @@ index d1806eee1687..b4893d713b8c 100644 } static inline size_t inet6_ifla6_size(void) -@@ -7084,6 +7085,13 @@ static const struct ctl_table addrconf_sysctl[] = { +@@ -7085,6 +7086,13 @@ static const struct ctl_table addrconf_sysctl[] = { .extra1 = (void *)SYSCTL_ZERO, .extra2 = (void *)SYSCTL_ONE, }, |