diff options
| -rw-r--r-- | docker/Dockerfile | 26 | ||||
| -rw-r--r-- | packages/netfilter/Jenkinsfile | 51 |
2 files changed, 0 insertions, 77 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index eb393f0a..546eeddc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -450,32 +450,6 @@ RUN apt-get update && apt-get install -y \ libtool \ pkg-config -# Packages needed for nftables -RUN apt-get update && apt-get install -y \ - asciidoc-base \ - automake \ - bison \ - debhelper-compat \ - dh-python \ - docbook-xsl \ - flex \ - libgmp-dev \ - libjansson-dev \ - libmnl-dev \ - libreadline-dev \ - libtool \ - libxtables-dev \ - python3-all \ - python3-setuptools \ - xsltproc - -# Packages needed for libnetfilter-conntrack -RUN apt-get update && apt-get install -y \ - debhelper-compat \ - libmnl-dev \ - libnfnetlink-dev \ - libtool - # Packages needed for wide-dhcpv6 RUN apt-get update && apt-get install -y \ bison \ diff --git a/packages/netfilter/Jenkinsfile b/packages/netfilter/Jenkinsfile deleted file mode 100644 index e5579813..00000000 --- a/packages/netfilter/Jenkinsfile +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (C) 2020-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 = [ - // libnftnl - ['name': 'pkg-libnftnl', - 'scmCommit': 'debian/1.1.7-1', - 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-libnftnl.git', - 'buildCmd': 'dpkg-buildpackage -uc -us -tc -b'], - - // nftables - ['name': 'pkg-nftables', - 'scmCommit': 'debian/0.9.6-1', - 'scmUrl': 'https://salsa.debian.org/pkg-netfilter-team/pkg-nftables.git', - 'buildCmd': '''sudo dpkg -i ../libnftnl*.deb; - sed -i "s/debhelper-compat.*/debhelper-compat (= 12),/" debian/control; - 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': '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/vyos/vyos-build -buildPackage('Netfilter', pkgList, null, true) |