diff options
| author | Nicholas Humfrey <njh@aelius.com> | 2019-01-29 23:12:00 +0000 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-01-30 06:12:00 +0700 |
| commit | 9df5e15e9939dea7e5ecc944661d0ecb8eb0ccf4 (patch) | |
| tree | a2ad5b5b4cb7adc0ed125d673aac55e8e1bd39e7 | |
| parent | c670deddbee8ae852770574d1c8fce29154812dd (diff) | |
| download | vyos-build-9df5e15e9939dea7e5ecc944661d0ecb8eb0ccf4.tar.gz vyos-build-9df5e15e9939dea7e5ecc944661d0ecb8eb0ccf4.zip | |
T1202: Add `hvinfo` to the packages directory (#43)
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| m--------- | packages/hvinfo | 0 | ||||
| -rwxr-xr-x | scripts/build-submodules | 1 |
4 files changed, 11 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 22bb87d5..8be1f363 100644 --- a/.gitmodules +++ b/.gitmodules @@ -236,4 +236,8 @@ [submodule "packages/igmpproxy"] path = packages/igmpproxy url = https://github.com/vyos/igmpproxy.git - branch = current
\ No newline at end of file + branch = current +[submodule "packages/hvinfo"] + path = packages/hvinfo + url = https://github.com/dmbaturin/hvinfo.git + branch = master diff --git a/docker/Dockerfile b/docker/Dockerfile index bca48ff8..889652f3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -234,6 +234,11 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i ../libvyosconfig0_*_amd64.deb +# Packages needed for hvinfo +RUN apt-get update && apt-get install -y \ + gnat \ + gprbuild + # Packages needed for vyos-1x RUN apt-get update && apt-get install -y \ whois diff --git a/packages/hvinfo b/packages/hvinfo new file mode 160000 +Subproject 6d15dff8eb5418a23035d18078f367bc799b702 diff --git a/scripts/build-submodules b/scripts/build-submodules index 0d11c059..11d386fd 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -198,6 +198,7 @@ for PKG in mdns-repeater \ eventwatchd \ ddclient \ rtrlib \ + hvinfo \ igmpproxy \ libvyosconfig \ vyatta-bash \ |