From 189d3a6ef179e720b5558c2deac3e5ab263feaba Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Tue, 19 Sep 2023 10:58:24 +0000 Subject: T5588: Add kernel module CONFIG_NF_CONNTRACK_BRIDGE (cherry picked from commit 97ddcaec1f488bef18c0d8dfa37cb272115e548a) --- packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 2 +- packages/linux-kernel/arch/x86/configs/vyos_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig index ab53a174..8537751b 100644 --- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig @@ -1322,7 +1322,7 @@ CONFIG_NF_TABLES_BRIDGE=m # CONFIG_NFT_BRIDGE_META is not set CONFIG_NFT_BRIDGE_REJECT=m CONFIG_NF_LOG_BRIDGE=m -# CONFIG_NF_CONNTRACK_BRIDGE is not set +CONFIG_NF_CONNTRACK_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index a779c30c..41454024 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -1475,7 +1475,7 @@ CONFIG_NF_DEFRAG_IPV6=m CONFIG_NF_TABLES_BRIDGE=m # CONFIG_NFT_BRIDGE_META is not set CONFIG_NFT_BRIDGE_REJECT=m -# CONFIG_NF_CONNTRACK_BRIDGE is not set +CONFIG_NF_CONNTRACK_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m -- cgit v1.2.3 From 3f78979cd2465cc511a27510f21533bcde70cded Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Tue, 19 Sep 2023 11:07:18 +0000 Subject: T5125: bump hsflowd version to v2.0.52-1 (cherry picked from commit 72f55aaac883d331a62e1506a3d35a80bf65933a) --- packages/hsflowd/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/hsflowd/Jenkinsfile b/packages/hsflowd/Jenkinsfile index 775d0ac7..a0e4ecd9 100644 --- a/packages/hsflowd/Jenkinsfile +++ b/packages/hsflowd/Jenkinsfile @@ -23,7 +23,7 @@ // and not via a DEB package def pkgList = [ ['name': 'host-sflow', - 'scmCommit': 'v2.0.50-4', + 'scmCommit': 'v2.0.52-1', 'scmUrl': 'https://github.com/sflow/host-sflow.git', 'buildCmd': 'cd ..; ./build.sh'], ] -- cgit v1.2.3 From c987c74db54b371bc19a15b369e117fafeffbd07 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Tue, 19 Sep 2023 20:59:40 +0200 Subject: Kernel: T4928: update Linux Kernel to v6.1.54 (cherry picked from commit dd9b5886f3b4bf134cb094da5cec860504f2ce2e) --- data/defaults.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/defaults.toml b/data/defaults.toml index 997eed0c..d34b05fb 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.1.53" +kernel_version = "6.1.54" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" -- cgit v1.2.3