summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/defaults.json4
-rw-r--r--data/live-build-config/archives/bullseye.list.chroot1
-rw-r--r--data/live-build-config/archives/bullseye.pref.chroot47
-rw-r--r--data/live-build-config/archives/buster-backports.pref.chroot31
-rw-r--r--docker/Dockerfile53
-rwxr-xr-xscripts/live-build-config8
-rwxr-xr-xscripts/make-version-file2
7 files changed, 13 insertions, 133 deletions
diff --git a/data/defaults.json b/data/defaults.json
index 507dd376..707d4195 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -1,8 +1,8 @@
{
"architecture": "amd64",
"debian_mirror": "http://deb.debian.org/debian",
- "debian_security_mirror": "http://deb.debian.org/debian-security",
- "debian_distribution": "buster",
+ "debian_security_mirror": "http://deb.debian.org/debian",
+ "debian_distribution": "bullseye",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/current",
"vyos_branch": "current",
"kernel_version": "5.10.45",
diff --git a/data/live-build-config/archives/bullseye.list.chroot b/data/live-build-config/archives/bullseye.list.chroot
deleted file mode 100644
index 16eb57e5..00000000
--- a/data/live-build-config/archives/bullseye.list.chroot
+++ /dev/null
@@ -1 +0,0 @@
-deb http://deb.debian.org/debian/ bullseye main
diff --git a/data/live-build-config/archives/bullseye.pref.chroot b/data/live-build-config/archives/bullseye.pref.chroot
deleted file mode 100644
index 7c7f38f3..00000000
--- a/data/live-build-config/archives/bullseye.pref.chroot
+++ /dev/null
@@ -1,47 +0,0 @@
-Package: libyang1
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: ddclient
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: podman
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: conmon
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: containernetworking-plugins
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: golang-github-containers-image
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: golang-github-containers-common
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: libseccomp2
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: runc
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: python3-cryptography
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: python3-paramiko
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: *
-Pin: release n=bullseye
-Pin-Priority: -10
diff --git a/data/live-build-config/archives/buster-backports.pref.chroot b/data/live-build-config/archives/buster-backports.pref.chroot
deleted file mode 100644
index e6eee698..00000000
--- a/data/live-build-config/archives/buster-backports.pref.chroot
+++ /dev/null
@@ -1,31 +0,0 @@
-Package: nftables
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: libnftables1
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: libnftnl11
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: conserver-server
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-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
-
-Package: *
-Pin: release n=buster-backports
-Pin-Priority: -10
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 51ad41d9..a09f4213 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,7 +18,7 @@
# This Dockerfile is installable on both x86, x86-64, armhf and arm64 systems
ARG ARCH=
-FROM ${ARCH}debian:buster
+FROM ${ARCH}debian:bullseye
# It is also possible to emulate an arm system inside docker,
# execution of this emulated system needs to be executed on an x86 or x86-64 host.
@@ -38,10 +38,7 @@ FROM ${ARCH}debian:buster
# On some versions of docker the emulation framework is not installed by default and
# you need to install qemu, qemu-user-static and register qemu inside docker manually using:
# `docker run --rm --privileged multiarch/qemu-user-static:register --reset`
-
-
LABEL authors="VyOS Maintainers <maintainers@vyos.io>"
-
ENV DEBIAN_FRONTEND noninteractive
# Standard shell should be bash not dash
@@ -91,7 +88,9 @@ RUN apt-get update && apt-get install -y \
python3-git \
python3-pip \
python3-flake8 \
- python3-autopep8
+ python3-autopep8 \
+ debootstrap \
+ live-build
# Syslinux and Grub2 is only supported on x86 and x64 systems
RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
@@ -158,20 +157,6 @@ RUN wget -O /tmp/open-vmdk-master.zip https://github.com/vmware/open-vmdk/archiv
make install
#
-# live-build: building with local packages fails due to missing keys
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941691
-# https://salsa.debian.org/live-team/live-build/merge_requests/30
-#
-RUN wget https://salsa.debian.org/jestabro-guest/live-build/commit/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch \
- -O /tmp/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
- git clone https://salsa.debian.org/live-team/live-build.git /tmp/live-build && \
- cd /tmp/live-build && git checkout debian/1%20190311 && \
- patch -p1 < /tmp/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
- dch -n "Applying fix for missing archive keys" && \
- dpkg-buildpackage -us -uc && \
- sudo dpkg -i ../live-build*.deb
-
-#
# live-build: building in docker fails with mounting /proc | /sys
#
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919659
@@ -255,7 +240,7 @@ RUN apt-get update && apt-get install -y \
bison \
debhelper \
flex \
- iptables-dev \
+ libxtables-dev \
libatm1-dev \
libcap-dev \
libdb-dev \
@@ -284,15 +269,6 @@ RUN export RTRLIB_VERSION="0.6.3" && export ARCH=$(dpkg-architecture -qDEB_HOST_
cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \
dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb
-# Upgrading to FRR 7.5 requires a more recent version of libyang which is only
-# available from Debian Bullseye
-RUN echo "deb http://deb.debian.org/debian/ bullseye main" \
- > /etc/apt/sources.list.d/bullseye.list && \
- apt-get update && apt-get install -y -t bullseye \
- libyang-dev \
- libyang1; \
- rm -f /etc/apt/sources.list.d/bullseye.list
-
# Packages needed to build FRR itself
# https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst
# for more info
@@ -385,7 +361,7 @@ RUN apt-get update && apt-get install -y \
dpkg-dev \
flex \
gperf \
- iptables-dev \
+ libxtables-dev \
libcap-dev \
libcurl4-openssl-dev \
libgcrypt20-dev \
@@ -434,8 +410,6 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
# Packages needed for vyos-cloud-init
RUN apt-get update && apt-get install -y \
- pep8 \
- pyflakes \
python3-configobj \
python3-httpretty \
python3-jsonpatch \
@@ -501,21 +475,6 @@ RUN apt-get update && apt-get install -y \
libnfnetlink-dev \
libtool
-# Packages needed for conntrack-tools
-RUN apt-get update && apt-get install -y \
- bison \
- debhelper \
- flex \
- libmnl-dev \
- libnetfilter-cthelper0-dev \
- libnetfilter-cttimeout-dev \
- libnetfilter-queue-dev \
- libnfnetlink-dev \
- libsystemd-dev \
- autoconf \
- automake \
- libtool
-
# Packages needed for wide-dhcpv6
RUN apt-get update && apt-get install -y \
bison \
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 467ef252..6a2a345d 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -42,7 +42,7 @@ lb config noauto \
--bootloader syslinux,grub-efi \
--binary-images iso-hybrid \
--checksums 'sha256 md5' \
- --debian-installer false \
+ --debian-installer none \
--distribution {{distribution}} \
--iso-application "VyOS" \
--iso-publisher "{{build_by}}" \
@@ -56,9 +56,9 @@ lb config noauto \
--archive-areas "main contrib non-free" \
--firmware-chroot false \
--firmware-binary false \
- --updates true \
- --security true \
- --backports true \
+ --updates false \
+ --security false \
+ --backports false \
--apt-recommends false \
--apt-options "--yes -oAPT::Default-Release="current" -oAPT::Get::allow-downgrades=true" \
--apt-indices false
diff --git a/scripts/make-version-file b/scripts/make-version-file
index e35dfd8b..04e27c44 100755
--- a/scripts/make-version-file
+++ b/scripts/make-version-file
@@ -105,7 +105,7 @@ PRETTY_NAME="VyOS {version} ({build_config['release_train']})"
NAME="VyOS"
VERSION_ID="{version}"
VERSION="{version} ({build_config['release_train']})"
-VERSION_CODENAME=buster
+VERSION_CODENAME=bullseye
ID=vyos
HOME_URL="https://vyos.io"
SUPPORT_URL="https://support.vyos.io"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-30 21:13:53 +0000