summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-01-30 22:04:59 +0100
committerChristian Poessinger <christian@poessinger.com>2019-01-30 22:04:59 +0100
commit78d69b0c252ba82da6bd4dbcbe50037052d58668 (patch)
tree83a9aaad6e27c80aa3333e3f5a811009b9248847
parentb9239d076d220059f2596f1163d785e953652964 (diff)
downloadvyos-build-78d69b0c252ba82da6bd4dbcbe50037052d58668.tar.gz
vyos-build-78d69b0c252ba82da6bd4dbcbe50037052d58668.zip
Revert "T1214: Add `ipaddrcheck` to the packages directory"
libcidr-dev is not available until Debian Buster thus the container can't be build. This reverts commit 9779f9938e1a80736738b2b9021a0db4dd872bfa.
-rw-r--r--.gitmodules4
-rw-r--r--docker/Dockerfile6
m---------packages/ipaddrcheck0
-rwxr-xr-xscripts/build-submodules1
4 files changed, 0 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules
index dd608357..2257b9f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -245,7 +245,3 @@
path = packages/libyang
url = https://github.com/opensourcerouting/libyang.git
branch = debian
-[submodule "packages/ipaddrcheck"]
- path = packages/ipaddrcheck
- url = https://github.com/vyos/ipaddrcheck.git
- branch = master
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 38dea015..13919ede 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -234,12 +234,6 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \
dpkg-buildpackage -uc -us -tc -b && \
dpkg -i ../libvyosconfig0_*_amd64.deb
-# Packages needed for ipaddrcheck
-RUN apt-get update && apt-get install -y \
- libpcre3-dev \
- libcidr-dev \
- check
-
# Packages needed for hvinfo
RUN apt-get update && apt-get install -y \
gnat \
diff --git a/packages/ipaddrcheck b/packages/ipaddrcheck
deleted file mode 160000
-Subproject 8f0d655cc68995a0ef88dc905dc62db2af23ec9
diff --git a/scripts/build-submodules b/scripts/build-submodules
index f3ab6cf7..af992649 100755
--- a/scripts/build-submodules
+++ b/scripts/build-submodules
@@ -260,7 +260,6 @@ for PKG in mdns-repeater \
rtrlib \
hvinfo \
igmpproxy \
- ipaddrcheck \
libvyosconfig \
vyatta-bash \
vyatta-biosdevname \