diff options
| -rw-r--r-- | .gitmodules | 7 | ||||
| -rw-r--r-- | data/package-lists/vyos-x86.list.chroot | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| m--------- | packages/hvinfo | 0 | ||||
| -rwxr-xr-x | scripts/build-submodules | 1 |
5 files changed, 12 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 30793200..2257b9f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -237,6 +237,11 @@ path = packages/igmpproxy url = https://github.com/vyos/igmpproxy.git branch = current +[submodule "packages/hvinfo"] + path = packages/hvinfo + url = https://github.com/dmbaturin/hvinfo.git + branch = master [submodule "packages/libyang"] path = packages/libyang - url = https://github.com/opensourcerouting/libyang.git + url = https://github.com/opensourcerouting/libyang.git + branch = debian diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot index 5bb0dbd7..6f5d7624 100644 --- a/data/package-lists/vyos-x86.list.chroot +++ b/data/package-lists/vyos-x86.list.chroot @@ -1,6 +1,5 @@ grub2 grub-pc -open-vm-tools qemu-guest-agent hyperv-daemons vyos-xe-guest-utilities diff --git a/docker/Dockerfile b/docker/Dockerfile index 36efdfef..13919ede 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 6423a14a..a167b6e0 100755 --- a/scripts/build-submodules +++ b/scripts/build-submodules @@ -258,6 +258,7 @@ for PKG in mdns-repeater \ eventwatchd \ ddclient \ rtrlib \ + hvinfo \ igmpproxy \ libvyosconfig \ vyatta-bash \ |