diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-09-19 22:27:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 22:27:56 +0300 |
| commit | 94e868383215c991ae36e556accc70964c1fc205 (patch) | |
| tree | f97dc698b1e7af2474f376c34a66d84c3f295d96 | |
| parent | 5a6aa5bb9ad9e54caebe42374ff73968a980220b (diff) | |
| parent | c987c74db54b371bc19a15b369e117fafeffbd07 (diff) | |
| download | vyos-build-94e868383215c991ae36e556accc70964c1fc205.tar.gz vyos-build-94e868383215c991ae36e556accc70964c1fc205.zip | |
Merge pull request #417 from c-po/T5588-sagitta
T5588, T5125, T4928 backports from current
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/hsflowd/Jenkinsfile | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 2 |
4 files changed, 4 insertions, 4 deletions
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" 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'], ] 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 |