diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 15 | ||||
| -rwxr-xr-x | packages/linux-kernel/build-intel-qat.sh | 2 | ||||
| -rw-r--r-- | packages/strongswan/Jenkinsfile | 30 | ||||
| -rw-r--r-- | vars/buildPackage.groovy | 2 |
6 files changed, 45 insertions, 10 deletions
diff --git a/data/defaults.json b/data/defaults.json index 6adaaf9..7a0e858 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", "vyos_branch": "current", - "kernel_version": "5.10.40", + "kernel_version": "5.10.41", "kernel_flavor": "amd64-vyos", "release_train": "sagitta", "additional_repositories": [ diff --git a/docker/Dockerfile b/docker/Dockerfile index f428797..0bf648c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -232,6 +232,10 @@ RUN apt-get update && apt-get install -y \ kmod \ cpio +# Packages needed for Intel QAT out-of-tree drivers +RUN apt-get update && apt-get install -y \ + yasm + # Packages needed for Accel-PPP RUN apt-get update && apt-get install -y \ liblua5.3-dev \ diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig index cb00a46..8c69585 100644 --- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig +++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.38 Kernel Configuration +# Linux/x86 5.10.41 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" CONFIG_CC_IS_GCC=y @@ -5279,12 +5279,13 @@ CONFIG_CRYPTO_DEV_SP_CCP=y CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_SP_PSP=y # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set -# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set -# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set -# CONFIG_CRYPTO_DEV_QAT_C62X is not set -# CONFIG_CRYPTO_DEV_QAT_DH895xCCVF is not set -# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set -# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set +CONFIG_CRYPTO_DEV_QAT=m +CONFIG_CRYPTO_DEV_QAT_DH895xCC=m +CONFIG_CRYPTO_DEV_QAT_C3XXX=m +CONFIG_CRYPTO_DEV_QAT_C62X=m +CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m +CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m +CONFIG_CRYPTO_DEV_QAT_C62XVF=m # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set # CONFIG_CRYPTO_DEV_CHELSIO is not set CONFIG_CRYPTO_DEV_VIRTIO=m diff --git a/packages/linux-kernel/build-intel-qat.sh b/packages/linux-kernel/build-intel-qat.sh index 1a0dedb..344870d 100755 --- a/packages/linux-kernel/build-intel-qat.sh +++ b/packages/linux-kernel/build-intel-qat.sh @@ -15,7 +15,7 @@ fi . ${KERNEL_VAR_FILE} declare -a intel=( - "https://downloadmirror.intel.com/30178/eng/QAT1.7.L.4.13.0-00009.tar.gz" + "http://dev.packages.vyos.net/source-mirror/QAT1.7.L.4.14.0-00031.tar.gz" ) for url in "${intel[@]}" diff --git a/packages/strongswan/Jenkinsfile b/packages/strongswan/Jenkinsfile new file mode 100644 index 0000000..ea41b18 --- /dev/null +++ b/packages/strongswan/Jenkinsfile @@ -0,0 +1,30 @@ +// Copyright (C) 2021 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')_ + +def pkgList = [ + ['name': 'strongSwan', + 'scmCommit': 'debian/5.9.1-1 ', + 'scmUrl': 'https://salsa.debian.org/debian/strongswan.git', + 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], +] + +// Start package build using library function from https://github.com/vyos/vyos-build +buildPackage('strongSwan', pkgList, null, true) diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy index 3e7c5d5..511867a 100644 --- a/vars/buildPackage.groovy +++ b/vars/buildPackage.groovy @@ -28,7 +28,7 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false) { options { disableConcurrentBuilds() skipDefaultCheckout() - timeout(time: 120, unit: 'MINUTES') + timeout(time: 180, unit: 'MINUTES') timestamps() buildDiscarder(logRotator(numToKeepStr: '20')) } |