summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/defaults.json2
-rw-r--r--data/live-build-config/archives/buster-backports.pref.chroot4
-rwxr-xr-xdata/live-build-config/hooks/live/18-enable-disable_services.chroot1
-rw-r--r--data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default6
-rw-r--r--docker/Dockerfile4
-rw-r--r--packages/linux-kernel/Jenkinsfile2
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig71
-rwxr-xr-xpackages/linux-kernel/build-intel-qat.sh2
-rw-r--r--packages/strongswan/Jenkinsfile30
-rw-r--r--tools/cloud-init/AWS/config.boot.default6
-rw-r--r--tools/cloud-init/GCE/config.boot.default6
-rw-r--r--tools/cloud-init/GCE/config.boot.default-debug6
-rw-r--r--tools/cloud-init/OCI/config.boot.default6
-rw-r--r--tools/cloud-init/PACKET/config.boot.default6
-rw-r--r--tools/cloud-init/PACKET/config.boot.default-debug6
-rw-r--r--tools/cloud-init/azure/config.boot.default6
-rw-r--r--tools/cloud-init/openstack/config.boot.default6
-rw-r--r--vars/buildPackage.groovy2
18 files changed, 83 insertions, 89 deletions
diff --git a/data/defaults.json b/data/defaults.json
index 2c848145..7a0e858d 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.35",
+ "kernel_version": "5.10.41",
"kernel_flavor": "amd64-vyos",
"release_train": "sagitta",
"additional_repositories": [
diff --git a/data/live-build-config/archives/buster-backports.pref.chroot b/data/live-build-config/archives/buster-backports.pref.chroot
index 304f4a5a..e6eee698 100644
--- a/data/live-build-config/archives/buster-backports.pref.chroot
+++ b/data/live-build-config/archives/buster-backports.pref.chroot
@@ -18,6 +18,10 @@ Package: conserver-client
Pin: release n=buster-backports
Pin-Priority: 600
+Package: keepalived
+Pin: release n=buster-backports
+Pin-Priority: 600
+
Package: wireguard-tools
Pin: release n=buster-backports
Pin-Priority: 600
diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index cd726c42..9bb1a957 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -3,6 +3,7 @@
echo I: Disabling services
systemctl disable exim4.service
systemctl disable sendmail.service
+systemctl disable smartd.service
systemctl disable isc-dhcp-server.service
systemctl disable isc-dhcp-relay.service
systemctl disable nfacctd.service
diff --git a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
index 76cd5fa6..7123ef54 100644
--- a/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
+++ b/data/live-build-config/includes.chroot/opt/vyatta/etc/config.boot.default
@@ -19,9 +19,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS0 {
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f4287975..0bf648c3 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/Jenkinsfile b/packages/linux-kernel/Jenkinsfile
index 9cd448d4..1cd73c40 100644
--- a/packages/linux-kernel/Jenkinsfile
+++ b/packages/linux-kernel/Jenkinsfile
@@ -49,7 +49,7 @@ def pkgList = [
'buildCmd': 'cd ..; ./build-linux-firmware.sh'],
// Accel-PPP
- ['name': 'accel-ppp', 'scmCommit': '59f8e1bc3f199c8d0d9',
+ ['name': 'accel-ppp', 'scmCommit': '277ad4c3c7af01b26',
'scmUrl': 'https://github.com/accel-ppp/accel-ppp.git',
'buildCmd': 'cd ..; pwd; ls -al; ./build-accel-ppp.sh'],
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index 0d8bbcf4..8c695858 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.33 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
@@ -2535,9 +2535,9 @@ CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_CDCETHER=m
CONFIG_USB_NET_CDC_EEM=m
-# CONFIG_USB_NET_CDC_NCM is not set
+CONFIG_USB_NET_CDC_NCM=m
# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set
-# CONFIG_USB_NET_CDC_MBIM is not set
+CONFIG_USB_NET_CDC_MBIM=m
# CONFIG_USB_NET_DM9601 is not set
# CONFIG_USB_NET_SR9700 is not set
# CONFIG_USB_NET_SR9800 is not set
@@ -2552,10 +2552,10 @@ CONFIG_USB_NET_SMSC95XX=m
# CONFIG_USB_NET_ZAURUS is not set
# CONFIG_USB_NET_CX82310_ETH is not set
# CONFIG_USB_NET_KALMIA is not set
-# CONFIG_USB_NET_QMI_WWAN is not set
+CONFIG_USB_NET_QMI_WWAN=m
# CONFIG_USB_NET_INT51X1 is not set
# CONFIG_USB_IPHETH is not set
-# CONFIG_USB_SIERRA_NET is not set
+CONFIG_USB_SIERRA_NET=m
# CONFIG_USB_VL600 is not set
# CONFIG_USB_NET_CH9200 is not set
# CONFIG_USB_NET_AQC111 is not set
@@ -4231,53 +4231,7 @@ CONFIG_USB_EZUSB_FX2=m
# CONFIG_USB_ISP1301 is not set
# end of USB Physical Layer drivers
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-
-#
-# USB Peripheral Controller
-#
-# CONFIG_USB_FOTG210_UDC is not set
-# CONFIG_USB_GR_UDC is not set
-# CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_PXA27X is not set
-# CONFIG_USB_MV_UDC is not set
-# CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_M66592 is not set
-# CONFIG_USB_BDC_UDC is not set
-# CONFIG_USB_AMD5536UDC is not set
-# CONFIG_USB_NET2272 is not set
-# CONFIG_USB_NET2280 is not set
-# CONFIG_USB_GOKU is not set
-# CONFIG_USB_EG20T is not set
-# CONFIG_USB_DUMMY_HCD is not set
-# end of USB Peripheral Controller
-
-# CONFIG_USB_CONFIGFS is not set
-
-#
-# USB Gadget precomposed configurations
-#
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_ETH is not set
-# CONFIG_USB_G_NCM is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_RAW_GADGET is not set
-# end of USB Gadget precomposed configurations
-
+# CONFIG_USB_GADGET is not set
# CONFIG_TYPEC is not set
# CONFIG_USB_ROLE_SWITCH is not set
CONFIG_MMC=m
@@ -5325,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 1a0dedb9..344870da 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 00000000..ea41b182
--- /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/tools/cloud-init/AWS/config.boot.default b/tools/cloud-init/AWS/config.boot.default
index 4e556a5d..f115c442 100644
--- a/tools/cloud-init/AWS/config.boot.default
+++ b/tools/cloud-init/AWS/config.boot.default
@@ -20,9 +20,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS0 {
diff --git a/tools/cloud-init/GCE/config.boot.default b/tools/cloud-init/GCE/config.boot.default
index cac26936..5af780a9 100644
--- a/tools/cloud-init/GCE/config.boot.default
+++ b/tools/cloud-init/GCE/config.boot.default
@@ -11,9 +11,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS0 {
diff --git a/tools/cloud-init/GCE/config.boot.default-debug b/tools/cloud-init/GCE/config.boot.default-debug
index a51c3f4d..a4f32062 100644
--- a/tools/cloud-init/GCE/config.boot.default-debug
+++ b/tools/cloud-init/GCE/config.boot.default-debug
@@ -22,9 +22,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS0 {
diff --git a/tools/cloud-init/OCI/config.boot.default b/tools/cloud-init/OCI/config.boot.default
index de724f0b..d5cb4c05 100644
--- a/tools/cloud-init/OCI/config.boot.default
+++ b/tools/cloud-init/OCI/config.boot.default
@@ -20,9 +20,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS0 {
diff --git a/tools/cloud-init/PACKET/config.boot.default b/tools/cloud-init/PACKET/config.boot.default
index b56a94aa..1ceff6a3 100644
--- a/tools/cloud-init/PACKET/config.boot.default
+++ b/tools/cloud-init/PACKET/config.boot.default
@@ -11,9 +11,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS1 {
diff --git a/tools/cloud-init/PACKET/config.boot.default-debug b/tools/cloud-init/PACKET/config.boot.default-debug
index 660f1d0f..1b850568 100644
--- a/tools/cloud-init/PACKET/config.boot.default-debug
+++ b/tools/cloud-init/PACKET/config.boot.default-debug
@@ -22,9 +22,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS1 {
diff --git a/tools/cloud-init/azure/config.boot.default b/tools/cloud-init/azure/config.boot.default
index 32025974..c3a0aa5d 100644
--- a/tools/cloud-init/azure/config.boot.default
+++ b/tools/cloud-init/azure/config.boot.default
@@ -11,9 +11,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS0 {
diff --git a/tools/cloud-init/openstack/config.boot.default b/tools/cloud-init/openstack/config.boot.default
index de724f0b..d5cb4c05 100644
--- a/tools/cloud-init/openstack/config.boot.default
+++ b/tools/cloud-init/openstack/config.boot.default
@@ -20,9 +20,9 @@ system {
}
}
ntp {
- server "0.pool.ntp.org"
- server "1.pool.ntp.org"
- server "2.pool.ntp.org"
+ server "time1.vyos.net"
+ server "time2.vyos.net"
+ server "time3.vyos.net"
}
console {
device ttyS0 {
diff --git a/vars/buildPackage.groovy b/vars/buildPackage.groovy
index 3e7c5d50..511867a6 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'))
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 10:19:28 +0000