diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-06-25 20:35:07 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-06-25 20:35:10 +0200 |
| commit | 3b86b0a8edd612403806cbd9d00c8228235cdd39 (patch) | |
| tree | 5985583bc4be0f987ff74b7e661e1765e5e16ea2 /packages/netfilter | |
| parent | d31021cdb55eb3ff02a962d2730cf627e005dc00 (diff) | |
| download | vyos-build-3b86b0a8edd612403806cbd9d00c8228235cdd39.tar.gz vyos-build-3b86b0a8edd612403806cbd9d00c8228235cdd39.zip | |
packages: netfilter: T1538: use require a recent version of libnetfilter-conntrack-dev
During the build of conntrack-tools we need to first install the recent version
of libnetfilter-conntrack-dev build in a previous step as its a dependency.
Diffstat (limited to 'packages/netfilter')
| -rw-r--r-- | packages/netfilter/Jenkinsfile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/packages/netfilter/Jenkinsfile b/packages/netfilter/Jenkinsfile index 60c3527..60df131 100644 --- a/packages/netfilter/Jenkinsfile +++ b/packages/netfilter/Jenkinsfile @@ -35,18 +35,17 @@ def pkgList = [ sed -i "s/debhelper-compat.*/debhelper-compat (= 12),/" debian/control; dpkg-buildpackage -uc -us -tc -b'''], - // conntrack-tools - ['name': 'pkg-conntrack-tools', - 'scmCommit': 'debian/1%1.4.6-1', - 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-conntrack-tools.git', - 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], - // libnetfilter-conntrack ['name': 'pkg-libnetfilter-conntrack', 'scmCommit': 'debian/1.0.8-1', 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-libnetfilter-conntrack.git', - 'buildCmd': '''sudo dpkg -i ../libnetfilter*.deb; - dpkg-buildpackage -uc -us -tc -b'''] + 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], + + // conntrack-tools + ['name': 'pkg-conntrack-tools', + 'scmCommit': 'debian/1%1.4.6-1', + 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-conntrack-tools.git', + 'buildCmd': '''sudo dpkg -i ../libnetfilter*.deb && dpkg-buildpackage -uc -us -tc -b'''], ] // Start package build using library function from https://github.com/c-po/vyos-build |