diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/dropbear/Jenkinsfile | 4 | ||||
| -rwxr-xr-x | packages/dropbear/build.sh | 4 | ||||
| -rw-r--r-- | packages/hsflowd/Jenkinsfile | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/Jenkinsfile | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch | 6 | ||||
| m--------- | packages/vyos-1x | 0 |
6 files changed, 11 insertions, 7 deletions
diff --git a/packages/dropbear/Jenkinsfile b/packages/dropbear/Jenkinsfile index a15793d1..539d7578 100644 --- a/packages/dropbear/Jenkinsfile +++ b/packages/dropbear/Jenkinsfile @@ -1,4 +1,4 @@ -// Copyright (C) 2022-2023 VyOS maintainers and contributors +// Copyright (C) 2022-2024 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 @@ -21,7 +21,7 @@ def pkgList = [ ['name': 'dropbear', - 'scmCommit': 'debian/2022.83-1', + 'scmCommit': 'debian/2022.83-1+deb12u1', 'scmUrl': 'https://salsa.debian.org/debian/dropbear.git', 'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build.sh'], ] diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index 0934f4f7..9376fa7a 100755 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -19,5 +19,9 @@ if [ -d $PATCH_DIR ]; then fi cd ${SRC} + +echo "I: Installing build dependencies" +sudo apt-get install -y libpam0g-dev + echo "I: Build Debian Package" dpkg-buildpackage -uc -us -tc -b diff --git a/packages/hsflowd/Jenkinsfile b/packages/hsflowd/Jenkinsfile index a0e4ecd9..bb9dd68d 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.52-1', + 'scmCommit': 'v2.0.55-1', 'scmUrl': 'https://github.com/sflow/host-sflow.git', 'buildCmd': 'cd ..; ./build.sh'], ] diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile index a4c9f274..9d88663a 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': '19c36e593d9b', + ['name': 'accel-ppp', 'scmCommit': '1.13.0', 'scmUrl': 'https://github.com/accel-ppp/accel-ppp.git', 'buildCmd': 'cd ..; pwd; ls -al; ./build-accel-ppp.sh'], diff --git a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch index 31544af4..b19a8d25 100644 --- a/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch +++ b/packages/linux-kernel/patches/kernel/0002-inotify-support-for-stackable-filesystems.patch @@ -190,7 +190,7 @@ index 1c4bfdab008d..cf567cc33679 100644 struct inotify_inode_mark *i_mark) { diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c -index 3fa2416264a4..38930c1e70d8 100644 +index 2c056d737c27..2cb1f0024e70 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -15,6 +15,7 @@ @@ -201,7 +201,7 @@ index 3fa2416264a4..38930c1e70d8 100644 #include <linux/file.h> #include <linux/fs_context.h> #include <linux/fs_parser.h> -@@ -1525,6 +1526,18 @@ static void ovl_inode_init_once(void *foo) +@@ -1528,6 +1529,18 @@ static void ovl_inode_init_once(void *foo) inode_init_once(&oi->vfs_inode); } @@ -220,7 +220,7 @@ index 3fa2416264a4..38930c1e70d8 100644 static int __init ovl_init(void) { int err; -@@ -1540,18 +1553,24 @@ static int __init ovl_init(void) +@@ -1543,18 +1556,24 @@ static int __init ovl_init(void) err = ovl_aio_request_cache_init(); if (!err) { err = register_filesystem(&ovl_fs_type); diff --git a/packages/vyos-1x b/packages/vyos-1x new file mode 160000 +Subproject b5d3d36d1f70e53ef6a8a6634ab863d94d791bf |