diff options
| -rw-r--r-- | Jenkinsfile | 2 | ||||
| -rw-r--r-- | README.md | 28 | ||||
| -rw-r--r-- | data/defaults.json | 6 | ||||
| -rw-r--r-- | docker/Dockerfile | 3 |
4 files changed, 34 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index ae964099..dbc18d2b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -105,7 +105,7 @@ pipeline { stage('Test') { steps { sh """ - cd build/ + cd build sudo ../scripts/check-qemu-install --debug live-image-amd64.hybrid.iso """ } @@ -253,6 +253,34 @@ building `vyos-strongswan` and can be ignored on other packages. **NOTE:** `vyos-strongswan` will only compile on a Linux system, running on macOS or Windows might result in a unittest deadlock (it never exits). +#### Building single packages from your own repositories + +You can also build packages that are not from the default git repositories, +for example from your own forks of the official vyos repositories. + +First create a directory "packages" at the top level of the vyos-build repository +and clone your package into it (creating a subdirectory with the package contents). +Then checkout the correct branch or commit you want to build before building the package. + +```bash +$ mkdir packages +$ cd packages +$ git clone git@github.com:myname/vyos-1x.git +$ cd vyos-1x +$ git checkout equuleus +$ cd ../.. +$ docker run --rm -it -v $(pwd):/vyos -w /vyos/packages/PACKAGENAME \ + --sysctl net.ipv6.conf.lo.disable_ipv6=0 \ + vyos-builder scripts/build-packages -b vyos-1x +``` + +**NOTE:** you need to git pull manually after you commit to the remote and before rebuilding, +the local repository won't be updated automatically. + +**WARNING:** any packages in the packages directory will be added to the iso during build, +replacing the upstream ones. Make sure you delete them (both the source directories and built +deb packages) if you want to build an iso from purely upstream packages. + # Development process ## Git branches diff --git a/data/defaults.json b/data/defaults.json index 44d1f089..a813801b 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -3,9 +3,9 @@ "debian_mirror": "http://deb.debian.org/debian", "debian_security_mirror": "http://deb.debian.org/debian-security", "debian_distribution": "buster", - "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", - "vyos_branch": "equuleus", - "kernel_version": "4.19.88", + "vyos_mirror": "http://dev.packages.vyos.net/repositories/current", + "vyos_branch": "current", + "kernel_version": "4.19.89", "kernel_flavor": "amd64-vyos", "additional_repositories": [], "custom_packages": [] diff --git a/docker/Dockerfile b/docker/Dockerfile index 94b30725..40d1fd53 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -84,7 +84,8 @@ RUN apt-get update && apt-get install -y \ libffi-dev \ libpcre3-dev -RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh --output /tmp/opam_install.sh && \ +RUN curl https://raw.githubusercontent.com/ocaml/opam/2.0.2/shell/install.sh \ + --output /tmp/opam_install.sh --retry 10 --retry-delay 5 && \ sed -i 's/read BINDIR/BINDIR=""/' /tmp/opam_install.sh && sh /tmp/opam_install.sh && \ opam init --root=/opt/opam --comp=4.08.0 --disable-sandboxing |