summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Jenkinsfile20
-rw-r--r--Makefile2
-rw-r--r--data/defaults.json2
-rw-r--r--docker/Dockerfile10
-rw-r--r--packages/linux-kernel/Jenkinsfile4
-rw-r--r--packages/linux-kernel/patches/kernel/0001-VyOS-Add-linkstate-IP-device-attribute.patch7
-rw-r--r--packages/linux-kernel/patches/kernel/0002-VyOS-add-inotify-support-for-stackable-filesystems-o.patch19
-rw-r--r--packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch (renamed from packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch)12
-rw-r--r--packages/linux-kernel/patches/kernel/0004-perf-fix-compilation-error-due-to-discarded-const-qu.patch31
9 files changed, 76 insertions, 31 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 5ddcd88d..4f56bde7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -152,9 +152,9 @@ pipeline {
}
}
}
- stage('Test ISO') {
+ stage('QEMU') {
parallel {
- stage('Without vyos-configd') {
+ stage('Testcases without vyos-configd') {
when {
expression { fileExists 'build/live-image-amd64.hybrid.iso' }
}
@@ -162,7 +162,7 @@ pipeline {
sh "sudo make test"
}
}
- stage('With vyos-configd') {
+ stage('Testcases with vyos-configd') {
when {
expression { fileExists 'build/live-image-amd64.hybrid.iso' }
}
@@ -170,6 +170,14 @@ pipeline {
sh "sudo make testd"
}
}
+ stage('Build QEMU image') {
+ when {
+ expression { fileExists 'build/live-image-amd64.hybrid.iso' }
+ }
+ steps {
+ sh "sudo make qemu"
+ }
+ }
}
}
}
@@ -221,11 +229,7 @@ pipeline {
echo 'One way or another, I have finished'
// the 'build' directory got elevated permissions during the build
// cdjust permissions so it can be cleaned up by the regular user
- sh '''
- if [ -d build ]; then
- sudo chmod -R 777 build/
- fi
- '''
+ sh 'sudo make purge'
deleteDir() /* cleanup our workspace */
}
}
diff --git a/Makefile b/Makefile
index 92cd08ec..4f96834a 100644
--- a/Makefile
+++ b/Makefile
@@ -262,4 +262,4 @@ clean:
.PHONY: purge
purge:
- rm -rf build/*
+ rm -rf build packer_build packer_cache \ No newline at end of file
diff --git a/data/defaults.json b/data/defaults.json
index 7512d136..90fa10b8 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": "4.19.148",
+ "kernel_version": "4.19.152",
"kernel_flavor": "amd64-vyos",
"release_train": "equuleus",
"additional_repositories": [
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b07122b2..7e6c673c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -191,6 +191,16 @@ RUN apt-get update && apt-get install -y \
dkms \
cdbs \
cmake \
+ elfutils \
+ libdw-dev \
+ systemtap-sdt-dev \
+ libunwind-dev \
+ libslang2-dev \
+ python-dev \
+ libiberty-dev \
+ binutils-dev \
+ libnuma-dev \
+ libbabeltrace-dev \
liblua5.2-dev \
liblua5.3-dev
diff --git a/packages/linux-kernel/Jenkinsfile b/packages/linux-kernel/Jenkinsfile
index 2b182211..32596199 100644
--- a/packages/linux-kernel/Jenkinsfile
+++ b/packages/linux-kernel/Jenkinsfile
@@ -92,7 +92,7 @@ pipeline {
doGenerateSubmoduleConfigurations: false,
extensions: [[$class: 'CleanCheckout'],
[$class: 'CloneOption', depth: 1, noTags: false, reference: '', shallow: true]],
- branches: [[name: 'v4.19.148' ]],
+ branches: [[name: 'v4.19.152' ]],
userRemoteConfigs: [[credentialsId: 'GitHub-vyosbot', url: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git']]])
}
}
@@ -133,7 +133,7 @@ pipeline {
checkout([$class: 'GitSCM',
doGenerateSubmoduleConfigurations: false,
extensions: [[$class: 'CleanCheckout']],
- branches: [[name: 'debian/1.0.20200712-1_bpo10+1' ]],
+ branches: [[name: 'debian/1.0.20200908-1_bpo10+1' ]],
userRemoteConfigs: [[credentialsId: 'GitHub-vyosbot', url: 'https://salsa.debian.org/debian/wireguard-linux-compat.git']]])
}
}
diff --git a/packages/linux-kernel/patches/kernel/0001-VyOS-Add-linkstate-IP-device-attribute.patch b/packages/linux-kernel/patches/kernel/0001-VyOS-Add-linkstate-IP-device-attribute.patch
index c70a9f13..c9467e74 100644
--- a/packages/linux-kernel/patches/kernel/0001-VyOS-Add-linkstate-IP-device-attribute.patch
+++ b/packages/linux-kernel/patches/kernel/0001-VyOS-Add-linkstate-IP-device-attribute.patch
@@ -1,4 +1,4 @@
-From 81d38c4a32e059ad7835f7dc254e7627642afbe9 Mon Sep 17 00:00:00 2001
+From 388b9bc4dc78cbc83c6476d765f6e0c3d3ed1fb4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 29 Apr 2013 18:50:15 -0700
Subject: [PATCH] VyOS: Add linkstate IP device attribute
@@ -6,7 +6,6 @@ Subject: [PATCH] VyOS: Add linkstate IP device attribute
Backport of earlier Vyatta patch.
(cherry picked from commit 7c5a851086686be14ae937c80d6cee34814dbefc)
-
---
Documentation/networking/ip-sysctl.txt | 13 +++++++++++++
include/linux/inetdevice.h | 1 +
@@ -91,10 +90,10 @@ index 9c0f4a92bcff..619edd130cfd 100644
};
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index a08d682ba676..17949eb57a5b 100644
+index 12a2cea9d606..e0870ba2a8e2 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
-@@ -2318,6 +2318,8 @@ static struct devinet_sysctl_table {
+@@ -2319,6 +2319,8 @@ static struct devinet_sysctl_table {
"route_localnet"),
DEVINET_SYSCTL_FLUSHING_ENTRY(DROP_UNICAST_IN_L2_MULTICAST,
"drop_unicast_in_l2_multicast"),
diff --git a/packages/linux-kernel/patches/kernel/0002-VyOS-add-inotify-support-for-stackable-filesystems-o.patch b/packages/linux-kernel/patches/kernel/0002-VyOS-add-inotify-support-for-stackable-filesystems-o.patch
index bf28f313..a8a2aede 100644
--- a/packages/linux-kernel/patches/kernel/0002-VyOS-add-inotify-support-for-stackable-filesystems-o.patch
+++ b/packages/linux-kernel/patches/kernel/0002-VyOS-add-inotify-support-for-stackable-filesystems-o.patch
@@ -1,4 +1,4 @@
-From 1d625d2f745b61a718ce52cd1729f467c17defa6 Mon Sep 17 00:00:00 2001
+From 77ce1f672326050d6b47dbab4f52f0bbcd553a37 Mon Sep 17 00:00:00 2001
From: Alex Harpin <development@landsofshadow.co.uk>
Date: Wed, 31 Dec 2014 10:33:38 +0000
Subject: [PATCH] VyOS: add inotify support for stackable filesystems
@@ -19,7 +19,6 @@ for bug #303, and will allow that commit to be reverted.
Bug #425 http://bugzilla.vyos.net/show_bug.cgi?id=425
(cherry picked from commit a93f1128bc83b5a6628da242e71c18ef05e81ea2)
-
---
fs/notify/inotify/Kconfig | 9 +++
fs/notify/inotify/inotify_user.c | 112 ++++++++++++++++++++++++++++++-
@@ -28,14 +27,14 @@ Bug #425 http://bugzilla.vyos.net/show_bug.cgi?id=425
4 files changed, 170 insertions(+), 3 deletions(-)
diff --git a/fs/notify/inotify/Kconfig b/fs/notify/inotify/Kconfig
-index b981fc0c8379..b0b208bd584b 100644
+index b981fc0c8379..1ccd92e52784 100644
--- a/fs/notify/inotify/Kconfig
+++ b/fs/notify/inotify/Kconfig
@@ -15,3 +15,12 @@ config INOTIFY_USER
For more information, see <file:Documentation/filesystems/inotify.txt>
If unsure, say Y.
-+
++
+config INOTIFY_STACKFS
+ bool "Inotify support for stackable filesystem"
+ select INOTIFY_USER
@@ -189,7 +188,7 @@ index 97a51690338e..0595de27e1b5 100644
struct inotify_inode_mark *i_mark)
{
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
-index 127df4a85c8a..d6d41a328f9d 100644
+index 246623406db9..dc13e98928ab 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -18,6 +18,7 @@
@@ -200,7 +199,7 @@ index 127df4a85c8a..d6d41a328f9d 100644
#include "overlayfs.h"
MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
-@@ -1703,6 +1704,18 @@ static void ovl_inode_init_once(void *foo)
+@@ -1712,6 +1713,18 @@ static void ovl_inode_init_once(void *foo)
inode_init_once(&oi->vfs_inode);
}
@@ -219,7 +218,7 @@ index 127df4a85c8a..d6d41a328f9d 100644
static int __init ovl_init(void)
{
int err;
-@@ -1717,13 +1730,21 @@ static int __init ovl_init(void)
+@@ -1726,13 +1739,21 @@ static int __init ovl_init(void)
err = register_filesystem(&ovl_fs_type);
if (err)
@@ -242,7 +241,7 @@ index 127df4a85c8a..d6d41a328f9d 100644
unregister_filesystem(&ovl_fs_type);
/*
-@@ -1732,7 +1753,6 @@ static void __exit ovl_exit(void)
+@@ -1741,7 +1762,6 @@ static void __exit ovl_exit(void)
*/
rcu_barrier();
kmem_cache_destroy(ovl_inode_cachep);
@@ -251,7 +250,7 @@ index 127df4a85c8a..d6d41a328f9d 100644
module_init(ovl_init);
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
-index 6a24905f6e1e..248b1441ba83 100644
+index 6a24905f6e1e..4484f0760588 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -9,6 +9,8 @@
@@ -271,7 +270,7 @@ index 6a24905f6e1e..248b1441ba83 100644
+
+struct inotify_stackfs {
+ struct list_head list; /* entry in inotify_fs_list */
-+ struct file_system_type *fs_type; /* registed file_system_type */
++ struct file_system_type *fs_type; /* registed file_system_type */
+ inotify_path_proc func; /* registed callback function */
+};
+
diff --git a/packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch b/packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch
index 38d5b980..de0487f6 100644
--- a/packages/linux-kernel/patches/kernel/0003-RFC-builddeb-add-linux-tools-package-with-perf.patch
+++ b/packages/linux-kernel/patches/kernel/0003-Perf-is-shipped-in-debian-in-linux-tools-version-pac.patch
@@ -1,8 +1,10 @@
+From be73c78420d9a23accfa9568e451046272ceab84 Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@linaro.org>
+Date: Sat, 17 Oct 2020 10:30:37 +0000
+Subject: [PATCH] Perf is shipped in debian in linux-tools-$version package
-Perf is shipped in debian in linux-tools-$version package. Extend
-the existing to builddeb script to build perf if BUILD_TOOLS=y
-is added the make deb-pkg line
+Extend the existing to builddeb script to build perf if BUILD_TOOLS=y is
+added the make deb-pkg line
Some features of this patch I'm uncomfortable with:
@@ -31,7 +33,7 @@ Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 0b31f4f1f92c..629144b4226b 100755
+index 0b31f4f1f92c..517a54e64509 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -39,10 +39,12 @@ tmpdir="$objtree/debian/tmp"
@@ -71,7 +73,7 @@ index 0b31f4f1f92c..629144b4226b 100755
+ mkdir -p $output/tools/perf
+ output="O=$output/tools/perf"
+ fi
-+ $MAKE -C $srctree/tools/perf $output LDFLAGS= srctree=$KBUILD_SRC prefix=$tools_dest/usr install
++ $MAKE V=1 -C $srctree/tools/perf $output LDFLAGS= srctree=$KBUILD_SRC prefix=$tools_dest/usr install
+ cat <<EOF >> debian/control
+
+Package: $tools_packagename
diff --git a/packages/linux-kernel/patches/kernel/0004-perf-fix-compilation-error-due-to-discarded-const-qu.patch b/packages/linux-kernel/patches/kernel/0004-perf-fix-compilation-error-due-to-discarded-const-qu.patch
new file mode 100644
index 00000000..35c392f7
--- /dev/null
+++ b/packages/linux-kernel/patches/kernel/0004-perf-fix-compilation-error-due-to-discarded-const-qu.patch
@@ -0,0 +1,31 @@
+From b61355d12854a6a400e4ddfc79f2f849ac9656dc Mon Sep 17 00:00:00 2001
+From: Christian Poessinger <christian@poessinger.com>
+Date: Sat, 17 Oct 2020 17:09:26 +0000
+Subject: [PATCH] perf: fix compilation error due to discarded const qualifier
+
+---
+ tools/perf/Makefile.config | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
+index ae0c5bee8014..51a48ea869dd 100644
+--- a/tools/perf/Makefile.config
++++ b/tools/perf/Makefile.config
+@@ -230,12 +230,12 @@ FEATURE_CHECK_LDFLAGS-libpython-version := $(PYTHON_EMBED_LDOPTS)
+ CFLAGS += -fno-omit-frame-pointer
+ CFLAGS += -ggdb3
+ CFLAGS += -funwind-tables
+-CFLAGS += -Wall
++CFLAGS += -Wno-discarded-qualifiers
+ CFLAGS += -Wextra
+ CFLAGS += -std=gnu99
+
+ CXXFLAGS += -std=gnu++11 -fno-exceptions -fno-rtti
+-CXXFLAGS += -Wall
++CXXFLAGS += -Wno-discarded-qualifiers
+ CXXFLAGS += -fno-omit-frame-pointer
+ CXXFLAGS += -ggdb3
+ CXXFLAGS += -funwind-tables
+--
+2.20.1
+
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-24 16:42:32 +0000