diff options
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/kea/.gitignore | 1 | ||||
| -rw-r--r-- | packages/kea/Jenkinsfile | 32 | ||||
| -rwxr-xr-x | packages/kea/build.sh | 20 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 5 |
5 files changed, 58 insertions, 2 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index b8211f20..b7df8ef6 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.68" +kernel_version = "6.1.69" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/packages/kea/.gitignore b/packages/kea/.gitignore new file mode 100644 index 00000000..8a9161fe --- /dev/null +++ b/packages/kea/.gitignore @@ -0,0 +1 @@ +isc-kea/ diff --git a/packages/kea/Jenkinsfile b/packages/kea/Jenkinsfile new file mode 100644 index 00000000..d5b20040 --- /dev/null +++ b/packages/kea/Jenkinsfile @@ -0,0 +1,32 @@ +// Copyright (C) 2023 VyOS maintainers and contributors +// +// This program is free software; you can redistribute it and/or modify +// in order to easy exprort images built to "external" world +// it under the terms of the GNU General Public License version 2 or later as +// published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +@NonCPS + +// Using a version specifier library, use 'current' branch. The underscore (_) +// is not a typo! You need this underscore if the line immediately after the +// @Library annotation is not an import statement! +@Library('vyos-build@current')_ + +// NOTE: we can build with -d as the libbpf dependency is installed manually +// and not via a DEB package +def pkgList = [ + ['name': 'isc-kea', + 'scmCommit': 'debian/2.4.1-1', + 'scmUrl': 'https://salsa.debian.org/debian/isc-kea', + 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build.sh'], +] + +// Start package build using library function from https://github.com/vyos/vyos-build +buildPackage('ISC Kea', pkgList, null, true, "**/packages/kea/**") diff --git a/packages/kea/build.sh b/packages/kea/build.sh new file mode 100755 index 00000000..ec46d293 --- /dev/null +++ b/packages/kea/build.sh @@ -0,0 +1,20 @@ +#!/bin/sh +CWD=$(pwd) +set -e + +SRC=isc-kea +if [ ! -d ${SRC} ]; then + echo "Source directory does not exists, please 'git clone'" + exit 1 +fi + +cd ${SRC} +PATCH_DIR=${CWD}/patches +for patch in $(ls ${PATCH_DIR}) +do + echo "I: Apply patch: ${PATCH_DIR}/${patch}" + patch -p1 < ${PATCH_DIR}/${patch} +done + +echo "I: Build Debian Package" +dpkg-buildpackage -uc -us -tc -b -d diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index 1496b152..3d214bc8 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -2528,6 +2528,7 @@ CONFIG_MLX4_EN_DCB=y CONFIG_MLX4_CORE=m CONFIG_MLX4_DEBUG=y CONFIG_MLX4_CORE_GEN2=y +CONFIG_MLX4_INFINIBAND=m CONFIG_MLX5_CORE=m # CONFIG_MLX5_FPGA is not set CONFIG_MLX5_CORE_EN=y @@ -2544,6 +2545,7 @@ CONFIG_MLX5_CORE_EN_DCB=y CONFIG_MLX5_EN_IPSEC=y CONFIG_MLX5_EN_TLS=y CONFIG_MLX5_SW_STEERING=y +CONFIG_MLX5_INFINIBAND=m # CONFIG_MLX5_SF is not set CONFIG_MLXSW_CORE=m CONFIG_MLXSW_CORE_HWMON=y @@ -4701,7 +4703,8 @@ CONFIG_LEDS_TRIGGER_NETDEV=m # Simple LED drivers # # CONFIG_ACCESSIBILITY is not set -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EDAC=y |