diff options
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | docker/Dockerfile | 10 | ||||
| -rw-r--r-- | docs/README.md | 2 |
3 files changed, 9 insertions, 13 deletions
@@ -40,7 +40,7 @@ There are several directories with their own purpose: build/ Used for temporary files used for the build and for build artifacts scripts/ Scripts that are used for the build process - data/ Data required for buildng the ISO (such as boot splash) + data/ Data required for building the ISO (such as boot splash) tools/ Scripts that are used for maintainer's tasks automation and other purposes, but not during ISO build process @@ -173,7 +173,7 @@ Fetching all submodules at once and update them to the recent remote branches ```bash $ git submodule update --init --recursive -$ git submodule update --remotes +$ git submodule update --remote ``` ### Building packages @@ -221,7 +221,7 @@ building `vyos-strongswan` and can be ignored on other packages. you want to recompile! **NOTE:** `vyos-strongswan` will only compile on a Linux system, running on macOS -or Windows migth result in a unittest deadlock (it never exits). +or Windows might result in a unittest deadlock (it never exits). Packages that are known to not build using this procedure (as of now): @@ -229,7 +229,7 @@ Packages that are known to not build using this procedure (as of now): vyatta-util - Not needed anymore vyatta-quagga - Not needed anymore vyos-1x - Unmet build dependencies: whois libvyosconfig0 -vyos-frr - Alott of requirements, scary stuff... +vyos-frr - A lot of requirements, scary stuff... vyos-kernel - Need special build instructions vyos-wireguard - Needs special build instructions ``` @@ -273,7 +273,7 @@ $ make vmware The default branch that contains the most recent VyOS code is called `current` rather than `master`. We know it's confusing, but it's not easy to fix. In a nutshell, the code we inherited from Vyatta Core had its `master` branch so out -of sync with everything it was beyong any repair. Vyatta developers used to create +of sync with everything it was beyond any repair. Vyatta developers used to create a new branch not when a release is ready for code freeze, but rather before starting to work on a new release. This is hard to change in existing code, so this is just the way it is, for now. diff --git a/docker/Dockerfile b/docker/Dockerfile index cffa8621..b27abe39 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -80,7 +80,6 @@ RUN apt-get update && apt-get install -y -t jessie-backports debhelper && \ iptables \ xl2tpd \ libcurl4-openssl-dev \ - libcurl4-openssl-dev \ libkrb5-dev \ libsqlite3-dev \ libssl-dev \ @@ -212,7 +211,8 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ xml-light \ batteries \ ocaml-protoc \ - ctypes-foreign + ctypes-foreign \ + menhir RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ ctypes @@ -222,11 +222,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/vyconf.git /tmp/vyconf && \ cd /tmp/vyconf && \ git checkout v0.1 && \ - ./build-setup.sh && \ - ./configure --enable-tests && \ - make && \ - make test && \ - make install + opam pin add vyconf . # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ diff --git a/docs/README.md b/docs/README.md index 60c86100..c0de03e0 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,6 +1,6 @@ A brief documentation about VyOS can be found at https://github.com/vyos-documentation or rendered at https://vyos.readthedocs.org -Another landing sport would be the old Wiki at http://wiki.vyos.net. +Another landing spot would be the old Wiki at http://wiki.vyos.net. Build instructions for a 1U DIY VyOS bare metal router is [here](1u-diy-atom-c3000/README.md) |