diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-04-16 20:12:54 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-04-26 10:28:48 +0200 |
| commit | 9e234232bf1ac1d139dde6da7c74f82a8b5b4f41 (patch) | |
| tree | e6b6d6978abbc44b873df1487ef67882efe87ab4 | |
| parent | 21a09ff13dadffd85e6d46d38ecf6b3e9dc8ca2e (diff) | |
| download | vyos-build-9e234232bf1ac1d139dde6da7c74f82a8b5b4f41.tar.gz vyos-build-9e234232bf1ac1d139dde6da7c74f82a8b5b4f41.zip | |
Packages: define custom command for vyos-strongswan
This is required to get a python3-vici package which is required by vyos-1x
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | scripts/build-packages | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 36895335..c4351555 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -259,7 +259,9 @@ RUN apt-get update && apt-get install -y \ libsqlite3-dev \ dh-apparmor \ gperf \ - libsystemd-dev + libsystemd-dev \ + python3-stdeb \ + python-setuptools # Packages needed for vyos-opennhrp RUN apt-get update && apt-get install -y \ diff --git a/scripts/build-packages b/scripts/build-packages index e800b80a..07baa040 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -174,7 +174,6 @@ vyos_packages = ['vyatta-bash', 'vyos-1x', 'vyatta-iproute', 'vyatta-quagga', - 'vyos-strongswan', 'vyos-vmwaretools-scripts', 'vyos-netplug', 'vyos-xe-guest-utilities', @@ -204,6 +203,14 @@ pkg_special.append( add_package('ipaddrcheck', branch='master')) pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') ) pkg_special.append( add_package('lldpd', url='https://github.com/vincentbernat/lldpd.git', branch='master', tag='1.0.3') ) +# VyOS strongswan ships additional python3-vici packages required by vyos-1x and this is not build by default +vyos_strongswan_build_cmd = "dpkg-buildpackage -b -us -uc -tc && " \ + "autoreconf -i && ./configure --enable-python-eggs && " \ + "cd src/libcharon/plugins/vici/python && make && " \ + "python3 setup.py --command-packages=stdeb.command bdist_deb && " \ + "mv ./deb_dist/*.deb " + repo_root + "/packages" +pkg_special.append( add_package('vyos-strongswan', custombuild_cmd=vyos_strongswan_build_cmd) ) + # # FreeRangeRouting (FRR) packages # |