diff options
| -rw-r--r-- | .gitmodules | 26 | ||||
| -rw-r--r-- | docker/Dockerfile | 7 | ||||
| m--------- | packages/ddclient | 0 | ||||
| m--------- | packages/libvyosconfig | 0 | ||||
| m--------- | packages/rtrlib | 0 | ||||
| m--------- | packages/vyatta-biosdevname | 0 | ||||
| m--------- | packages/vyos-opennhrp | 0 | ||||
| m--------- | packages/vyos-salt-minion | 0 | ||||
| -rwxr-xr-x | scripts/build-submodules | 6 |
9 files changed, 38 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 939d77c6..82c3cbf6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -193,4 +193,28 @@ [submodule "packages/eventwatchd"] path = packages/eventwatchd url = https://github.com/vyos/eventwatchd.git - branch = current
\ No newline at end of file + branch = current +[submodule "packages/ddclient"] + path = packages/ddclient + url = https://github.com/vyos/ddclient.git + branch = current +[submodule "packages/vyatta-biosdevname"] + path = packages/vyatta-biosdevname + url = https://github.com/vyos/vyatta-biosdevname.git + branch = current +[submodule "packages/vyos-opennhrp"] + path = packages/vyos-opennhrp + url = https://github.com/vyos/vyos-opennhrp.git + branch = current +[submodule "packages/vyos-salt-minion"] + path = packages/vyos-salt-minion + url = https://github.com/vyos/vyos-salt-minion.git + branch = current +[submodule "packages/rtrlib"] + path = packages/rtrlib + url = https://github.com/rtrlib/rtrlib.git +[submodule "packages/libvyosconfig"] + path = packages/libvyosconfig + url = https://github.com/vyos/libvyosconfig.git + branch = master + diff --git a/docker/Dockerfile b/docker/Dockerfile index 34124407..03f17890 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -173,6 +173,13 @@ RUN apt-get update && apt-get install -y \ libnetfilter-cttimeout-dev \ libnetfilter-queue-dev +# Packages needed for libvyosconfig +RUN apt-get update && apt-get install -y \ + libffi-dev \ + ocaml-findlib \ + opam \ + menhir + # Update live-build RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list &&\ apt-get update &&\ diff --git a/packages/ddclient b/packages/ddclient new file mode 160000 +Subproject 869a613c81245678f1261034ff941fc047c2c15 diff --git a/packages/libvyosconfig b/packages/libvyosconfig new file mode 160000 +Subproject e75e4ae638c49e512a3013d1806e59a67978c5f diff --git a/packages/rtrlib b/packages/rtrlib new file mode 160000 +Subproject db2d254d75b835abb169f2f9e4a8cfbe74a3c36 diff --git a/packages/vyatta-biosdevname b/packages/vyatta-biosdevname new file mode 160000 +Subproject 28ccb143a09e8a1fb8363757c9a82c3e732a552 diff --git a/packages/vyos-opennhrp b/packages/vyos-opennhrp new file mode 160000 +Subproject 41f0852dd0b8d4900a1a743334d88afe490ee58 diff --git a/packages/vyos-salt-minion b/packages/vyos-salt-minion new file mode 160000 +Subproject c64e526a98d4ea8ee3a300bf36cd4348cd46a56 diff --git a/scripts/build-submodules b/scripts/build-submodules index 50814b00..5dc81e2e 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -205,7 +205,11 @@ for PKG in mdns-repeater \ udp-broadcast-relay \ conntrack-tools \ eventwatchd \ + ddclient \ + rtrlib \ + libvyosconfig \ vyatta-bash \ + vyatta-biosdevname \ vyatta-cfg \ vyatta-cfg-firewall \ vyatta-cfg-op-pppoe \ @@ -240,6 +244,8 @@ for PKG in mdns-repeater \ vyatta-zone \ vyos-keepalived \ vyos-nhrp \ + vyos-opennhrp \ + vyos-salt-minion \ vyos-strongswan \ vyos-world \ ; do |