diff options
| -rw-r--r-- | data/defaults.json | 2 | ||||
| -rw-r--r-- | data/live-build-config/archives/buster-backports.pref.chroot | 4 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/80-delete-docs.chroot | 6 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/data/defaults.json b/data/defaults.json index 960e278c..b35c3394 100644 --- a/data/defaults.json +++ b/data/defaults.json @@ -5,7 +5,7 @@ "debian_distribution": "buster", "vyos_mirror": "http://dev.packages.vyos.net/repositories/equuleus", "vyos_branch": "equuleus", - "kernel_version": "5.4.187", + "kernel_version": "5.4.200", "kernel_flavor": "amd64-vyos", "release_train": "equuleus", "additional_repositories": [ diff --git a/data/live-build-config/archives/buster-backports.pref.chroot b/data/live-build-config/archives/buster-backports.pref.chroot index a8cd1bd0..1ec012f8 100644 --- a/data/live-build-config/archives/buster-backports.pref.chroot +++ b/data/live-build-config/archives/buster-backports.pref.chroot @@ -18,10 +18,6 @@ Package: conserver-client Pin: release n=buster-backports Pin-Priority: 600 -Package: keepalived -Pin: release n=buster-backports -Pin-Priority: 600 - Package: wireguard-tools Pin: release n=buster-backports Pin-Priority: 600 diff --git a/data/live-build-config/hooks/live/80-delete-docs.chroot b/data/live-build-config/hooks/live/80-delete-docs.chroot index d08b8edd..fa1f5168 100755 --- a/data/live-build-config/hooks/live/80-delete-docs.chroot +++ b/data/live-build-config/hooks/live/80-delete-docs.chroot @@ -1,4 +1,6 @@ #!/bin/bash -# We do not need any documentation on the system. This frees 43MB. -rm -rf /usr/share/doc /usr/share/doc-base /usr/share/docutils +# We do not need any documentation on the system. This frees some space. +# Copyright/licenses files are ignored for deletion +shopt -s extglob +rm -rf /usr/share/doc/*/!(copyright) /usr/share/doc-base diff --git a/docker/Dockerfile b/docker/Dockerfile index 37ab9f60..c2e09521 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -138,7 +138,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#550048b3 -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#51f6402a -y # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ @@ -149,7 +149,7 @@ RUN apt-get update && apt-get install -y \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig && \ - cd /tmp/libvyosconfig && git checkout 5138b5eb && \ + cd /tmp/libvyosconfig && git checkout f2da09a9 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb |