From 78d69b0c252ba82da6bd4dbcbe50037052d58668 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Wed, 30 Jan 2019 22:04:59 +0100 Subject: 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. --- .gitmodules | 4 ---- docker/Dockerfile | 6 ------ packages/ipaddrcheck | 1 - scripts/build-submodules | 1 - 4 files changed, 12 deletions(-) delete mode 160000 packages/ipaddrcheck 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 index 8f0d655c..00000000 --- a/packages/ipaddrcheck +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8f0d655cc68995a0ef88dc905dc62db2af23ec90 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 \ -- cgit v1.2.3