summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/defaults.json8
-rwxr-xr-xdata/live-build-config/hooks/live/10-unmountfs.chroot2
-rwxr-xr-xdata/live-build-config/hooks/live/24-efi_packages.chroot2
-rw-r--r--data/live-build-config/package-lists/vyos-utils.list.chroot3
-rw-r--r--data/package-lists/vyos-x86.list.chroot2
-rw-r--r--data/versions1
-rw-r--r--docker/Dockerfile83
-rw-r--r--docker/no--check-valid-until1
-rw-r--r--docker/vyos-dev.key32
-rwxr-xr-xscripts/build-packages17
-rwxr-xr-xscripts/live-build-config9
11 files changed, 46 insertions, 114 deletions
diff --git a/data/defaults.json b/data/defaults.json
index bf6e4bca..5e6515d9 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -2,15 +2,11 @@
"architecture": "amd64",
"debian_mirror": "http://deb.debian.org/debian",
"debian_security_mirror": "http://deb.debian.org/debian-security",
- "debian_distribution": "jessie",
+ "debian_distribution": "buster",
"vyos_mirror": "http://dev.packages.vyos.net/repositories/current",
"vyos_branch": "current",
"kernel_version": "4.19.54",
"kernel_flavor": "amd64-vyos",
- "additional_repositories": [
- "deb http://repo.saltstack.com/apt/debian/8/amd64/2017.7 jessie main",
- "deb http://repo.powerdns.com/debian jessie-rec-41 main",
- "deb http://archive.debian.org/debian/ jessie-backports main"
- ],
+ "additional_repositories": [],
"custom_packages": []
}
diff --git a/data/live-build-config/hooks/live/10-unmountfs.chroot b/data/live-build-config/hooks/live/10-unmountfs.chroot
index 7992a4d2..05bcc12c 100755
--- a/data/live-build-config/hooks/live/10-unmountfs.chroot
+++ b/data/live-build-config/hooks/live/10-unmountfs.chroot
@@ -1,5 +1,5 @@
#!/bin/sh
-
+exit 0
# hack umountfs script to cleanly unmount live systems
sed \
diff --git a/data/live-build-config/hooks/live/24-efi_packages.chroot b/data/live-build-config/hooks/live/24-efi_packages.chroot
index c2b1ff11..49bc6ebb 100755
--- a/data/live-build-config/hooks/live/24-efi_packages.chroot
+++ b/data/live-build-config/hooks/live/24-efi_packages.chroot
@@ -1,5 +1,5 @@
#!/bin/sh
-
+exit 0
echo I: Download grub-efi packages.
mkdir -p /usr/share/vyos/packages
diff --git a/data/live-build-config/package-lists/vyos-utils.list.chroot b/data/live-build-config/package-lists/vyos-utils.list.chroot
index 4dcfef1e..ee2073fb 100644
--- a/data/live-build-config/package-lists/vyos-utils.list.chroot
+++ b/data/live-build-config/package-lists/vyos-utils.list.chroot
@@ -4,8 +4,7 @@ ipcalc
sipcalc
mtr-tiny
whois
-netcat
-netcat6
+netcat-openbsd
socat
telnet
nano
diff --git a/data/package-lists/vyos-x86.list.chroot b/data/package-lists/vyos-x86.list.chroot
index 6f5d7624..8e2b8692 100644
--- a/data/package-lists/vyos-x86.list.chroot
+++ b/data/package-lists/vyos-x86.list.chroot
@@ -2,5 +2,5 @@ grub2
grub-pc
qemu-guest-agent
hyperv-daemons
-vyos-xe-guest-utilities
vyos-netplug
+vyos-xe-guest-utilities
diff --git a/data/versions b/data/versions
index 3d0c2871..5cbb0ad3 100644
--- a/data/versions
+++ b/data/versions
@@ -1,3 +1,4 @@
{
+ "equuleus": "1.3.0",
"current": "1.2.0"
}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 970fc1bc..041a9260 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,7 +16,7 @@
# Must be run with --privileged flag, recommended to run the container with a
# volume mapped in order to easy export images
-FROM debian:jessie
+FROM debian:buster
LABEL authors="VyOS Maintainers <maintainers@vyos.io>"
ENV DEBIAN_FRONTEND noninteractive
@@ -63,33 +63,19 @@ RUN apt-get update && apt-get install -y \
python3-coverage \
python3-sphinx \
python3-pystache \
+ python3-git \
+ python3-pip \
pkg-config \
debhelper \
+ gosu \
+ live-build \
jq
-#
-# Setup Debian Jessie Backports repository
-#
-COPY no--check-valid-until /etc/apt/apt.conf.d/
-RUN echo "deb http://archive.debian.org/debian/ jessie-backports main" \
- > /etc/apt/sources.list.d/jessie-backports.list
-
-RUN apt-get update && apt-get install -y -t jessie-backports \
- python3-git \
- python3-pip \
- gosu
-
# Package needed for mdns-repeater
-RUN apt-get update && apt-get install -y -t jessie-backports \
+RUN apt-get update && apt-get install -y \
dh-systemd
#
-# Remove Debian Jessie Backports repository
-#
-RUN rm -f /etc/apt/sources.list.d/jessie-backports.list \
- /etc/apt/apt.conf.d/no--check-valid-until
-
-#
# Building libvyosconf requires a full configured OPAM/OCaml setup
#
RUN apt-get update && apt-get install -y \
@@ -159,7 +145,7 @@ RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y \
libpcap-dev \
libpq-dev \
- libmysqlclient-dev \
+ default-libmysqlclient-dev \
libgeoip-dev \
librabbitmq-dev \
libjansson-dev \
@@ -172,11 +158,12 @@ RUN apt-get update && apt-get install -y \
# Packages needed for kernel
RUN apt-get update && apt-get install -y \
- kernel-package \
libncurses5-dev \
flex \
bison \
- libelf-dev
+ libelf-dev \
+ bc \
+ kmod
# Packages needed for vyos-accel-ppp
RUN apt-get update && apt-get install -y \
@@ -198,16 +185,7 @@ RUN export RTRLIB_VERSION="0.6.3" && \
cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \
dpkg -i ../librtr*_amd64.deb ../librtr*_all.deb
-#
-# Setup VyOS Debian repository
-#
-COPY vyos-dev.key /tmp/vyos-dev.key
-RUN apt-key add /tmp/vyos-dev.key
-RUN echo "deb http://dev.packages.vyos.net/repositories/current/debian/ current main" \
- > /etc/apt/sources.list.d/vyos.list
-
# Packages needed to build frr itself
-# libyang-dev packages are hsoted on dev.packages.vyos.net see
# https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst
# for more info
RUN apt-get update && apt-get install -y \
@@ -221,11 +199,6 @@ RUN apt-get update && apt-get install -y \
python3-pytest \
texinfo
-#
-# Cleanup VyOS Debian Repository
-#
-RUN rm -f /etc/apt/sources.list.d/vyos.list
-
# Packages needed for conntrack-tools
RUN apt-get update && apt-get install -y \
libnetfilter-conntrack-dev \
@@ -248,16 +221,10 @@ RUN apt-get update && apt-get install -y \
# Packages needed for ipaddrcheck
RUN apt-get update && apt-get install -y \
+ libcidr0 \
+ libcidr-dev \
check
-# As there is no Debian Jessie/Stretch package for libcidr available but this
-# is required for ipaddrcheck we have to build it from source
-RUN git clone https://github.com/wikimedia/analytics-libcidr.git && \
- cd analytics-libcidr && \
- git checkout 026c611d90a1 && \
- dpkg-buildpackage -uc -us -tc -b && \
- dpkg -i ../libcidr*.deb
-
# Packages needed for lldpd
RUN apt-get update && apt-get install -y \
libbsd-dev \
@@ -310,15 +277,7 @@ RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y \
python-all \
python2.7-dev \
- libmysqld-dev
-
-# Update live-build
-RUN echo 'deb http://ftp.debian.org/debian stretch main' | tee -a /etc/apt/sources.list.d/stretch.list && \
- apt-get update && apt-get install -y -t stretch \
- live-build && \
- rm -f /etc/apt/sources.list.d/stretch.list && \
- apt-get update && \
- rm -rf /var/lib/apt/lists/*
+ libmariadb-dev
# Install packer
RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packer | \
@@ -327,6 +286,22 @@ RUN export LATEST="$(curl -s https://checkpoint-api.hashicorp.com/v1/check/packe
curl -K- | gzip -d > /usr/bin/packer && \
chmod +x /usr/bin/packer
+#
+# live-build: building in docker fails with mounting /proc | /sys
+#
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919659
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=921815
+# https://salsa.debian.org/installer-team/debootstrap/merge_requests/26
+#
+RUN wget https://salsa.debian.org/klausenbusk-guest/debootstrap/commit/a9a603b17cadbf52cb98cde0843dc9f23a08b0da.patch && \
+ git clone https://salsa.debian.org/installer-team/debootstrap && \
+ cd debootstrap && \
+ git checkout 1.0.114 && \
+ patch -p1 < ../a9a603b17cadbf52cb98cde0843dc9f23a08b0da.patch && \
+ dch -n "Applying fix for docker image compile" && \
+ dpkg-buildpackage -us -uc && \
+ sudo dpkg -i ../debootstrap*.deb
+
# Allow password-less 'sudo' for all users in group 'sudo'
RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \
chmod a+s /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/gosu /usr/sbin/usermod
diff --git a/docker/no--check-valid-until b/docker/no--check-valid-until
deleted file mode 100644
index 27ed79f3..00000000
--- a/docker/no--check-valid-until
+++ /dev/null
@@ -1 +0,0 @@
-Acquire::Check-Valid-Until "0";
diff --git a/docker/vyos-dev.key b/docker/vyos-dev.key
deleted file mode 100644
index a6522e36..00000000
--- a/docker/vyos-dev.key
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQENBFOQPGwBCADjm8Oq3kaJQh0rI33XVfd9mNq5ffay884SlDCbG1hkLVf8tnGV
-cjH7/nFfJdW/6Gr4dj4LQuHHnin5QeWnlHfuOySlOEsJCNP5dm14oEjy7epSXOv2
-A3m2tPDDqwMgfrOyw1gN+Clit9QIujiRzbcakqearyNxcVNvinIVunNiWbAyIhvc
-uI6yfMjno4q/O83c7e1zBqJj9t9guQjBuqaJrmZVf985/6ue9yWzSI4JtzxVmhKI
-dfCxHWE7BiEt2hnZPSVGcb4q6cBrkpcra7Ny55eoyN51wQGokPv3a9/8b3r5speR
-gene2MTvD/3eZOtTvMN000f/gJX4E6o8xx+fABEBAAG0R1Z5T1MgTWFpbnRhaW5l
-cnMgKERldmVsb3BtZW50IGFuZCB0ZXN0aW5nIHJlcG9zKSA8bWFpbnRhaW5lcnNA
-dnlvcy5uZXQ+iQE4BBMBAgAiBQJTkDxsAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe
-AQIXgAAKCRAywkm9DfBLXJbHB/4xlwn+6cZGEWWNZgXwUTMeHubZItl1o3Tbrzaa
-E3EqYyHJMYb3gBLOomlw7JLw5qT/247tlPC8ricl+BpeE5vYA3a08mIpcymROFh6
-pKJLNvdZHjrVN9yH2xYifI5sIDyuPga8Bgq/BMRiB1ragS/on2aUs75+tsEI32NI
-JO8+jIav0Nd6n/Wmw55ioTXS3fx6VDb64D80luOf1ve5LFDs8Oz2I+ZjSf7mPMY/
-b9qQHNb/300k/tIeK2F4G7LFu6o/1YMlrv0Ry7j9BsLzIkmTh0pX4mSVvF6IrxsZ
-WJRKu3uQDH2qccjptZDq4jHo/ow+aWT8rakjOgL9nJgKD5u/uQENBFOQPGwBCAC0
-zHpsmcfUIDyflGL+vwHV/3L02/vItHXfIkugL+wFB9C9i6nWA1KqNJwqNflJLGQF
-y+vHXs0oa3oMKj7S3p2zTbuU8s9Vz2Cg5c15sy7yGjh/LTwVOR5ZJrgbRJxTTp9K
-j5bkrx/DbDjIQ5szyjZ5N1ZAUyUx5Z/xMB3mTnLxDASvaoq+/F6WNcYY7NzjI7M0
-SFtnZLj6MFUVTmSbyYdGQc/Cxu5Utl7WKJUqHW5z10vJruZsdKV2+vf98yqhAJ+v
-wPhKUoVD+KtCH/CrHFrVq0hCKIMtyPLtaTeR/QnCNDEsV4p82HB9KQOYEADEL3/A
-a7Dntf3Xi+5eO/3MlnshABEBAAGJAR8EGAECAAkFAlOQPGwCGwwACgkQMsJJvQ3w
-S1z+wwf9GnVn9GhbB1FhKQdavljp9rUzz8FvH3tRpftdhhJ8B0PVAMl4QRcIXrgD
-nyd1K9ggzyWa4Z/9PygvH0Njv4YWlZh900wei9uVD8am1ncgQ/Jqlb36WvXyr8W/
-VPzQDtKAOkUz6RhKQ4V6I0PBK9nGeqeFkeH1bF1uGXkKpa0hGWffyOT1VasaZVXT
-UN4VAYNzBwkoU0mIYK73CPi7e4YJrtOp/i8MGDL3pxKaZEEZJdc4/dZassqBuwSG
-MRr2kecj9f53KWI0jLQdLgTMJQxscotfzhsWoF/842sUCbezwV3/4FtBhlNeqUHA
-c9HOeh3wbjjt4uONvxeleE+jM9v63Q==
-=gflA
------END PGP PUBLIC KEY BLOCK-----
-
diff --git a/scripts/build-packages b/scripts/build-packages
index 69cef3c0..5abd1ea6 100755
--- a/scripts/build-packages
+++ b/scripts/build-packages
@@ -11,7 +11,7 @@ current_working_directory = os.getcwd()
repo_root = subprocess.check_output('git rev-parse --show-toplevel', shell=True, universal_newlines=True).rstrip('\n')
repo_sha = subprocess.check_output('git rev-parse --short=12 HEAD', shell=True, universal_newlines=True).rstrip('\n')
-def add_package(name, url=None, commit='HEAD', branch='current', tag=None, custombuild_cmd=None):
+def add_package(name, url=None, commit='HEAD', branch='equuleus', tag=None, custombuild_cmd=None):
"""
Build up source package with URL and build commands executed during the later
called build_package step.
@@ -158,8 +158,6 @@ vyos_packages = ['vyatta-bash',
'vyatta-op-qos',
'vyatta-cfg-op-pppoe',
'vyatta-openvpn',
- 'vyatta-conntrack',
- 'vyatta-conntrack-sync',
'vyatta-nat',
'vyatta-config-mgmt',
'vyatta-config-migrate',
@@ -169,7 +167,6 @@ vyos_packages = ['vyatta-bash',
'vyatta-webproxy',
'vyatta-cfg-quagga',
'vyatta-op-quagga',
- 'vyatta-op-dhcp-server',
'vyatta-wireless',
'vyatta-wirelessmodem',
'vyatta-wanloadbalance',
@@ -180,17 +177,18 @@ vyos_packages = ['vyatta-bash',
'vyos-replace',
'vyos-nhrp',
'vyos-world',
- 'vyos-1x',
'vyatta-iproute',
'vyos-vmwaretools-scripts',
- 'vyos-netplug',
- 'vyos-xe-guest-utilities',
'vyatta-biosdevname',
'vyos-opennhrp',
'vyos-salt-minion',
- 'xl2tpd',
'mdns-repeater',
'udp-broadcast-relay',
+ 'vyos-1x',
+ 'vyatta-conntrack',
+ 'vyatta-conntrack-sync',
+ 'vyos-xe-guest-utilities',
+ 'vyos-netplug',
'pmacct',
'ddclient',
'igmpproxy',
@@ -210,9 +208,6 @@ pkg_special.append( add_package('ipaddrcheck', branch='master'))
# Packages where we directly build the upstream source
pkg_special.append( add_package('hvinfo', url='https://github.com/dmbaturin/hvinfo.git', branch='master') )
-pkg_special.append( add_package('lldpd', url='https://github.com/vincentbernat/lldpd.git', branch='master', tag='1.0.3') )
-pkg_special.append( add_package('ethtool', url='https://salsa.debian.org/kernel-team/ethtool.git', branch='master', tag='debian/1%4.19-1') )
-pkg_special.append( add_package('bgpq3', url='https://salsa.debian.org/debian/bgpq3.git', branch='master', tag='debian/0.1.33-1') )
# VyOS strongswan ships additional python3-vici packages required by vyos-1x and this is not build by default
vyos_strongswan_build_cmd = "dpkg-buildpackage -b -us -uc -tc && " \
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 1b3b4541..9855467d 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -35,8 +35,8 @@ util.check_build_config()
lb_config_tmpl = """
lb config noauto \
--architectures {{architecture}} \
- --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=ttyS0,115200 console=tty0" \
- --bootappend-live-failsafe "live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal console=ttyS0,115200 console=tty0" \
+ --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0" \
+ --bootappend-live-failsafe "live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0" \
--linux-flavours {{kernel_flavor}} \
--linux-packages linux-image-{{kernel_version}} \
--bootloader syslinux,grub-efi \
@@ -46,7 +46,7 @@ lb config noauto \
--iso-application "VyOS" \
--iso-publisher "{{build_by}}" \
--iso-volume "VyOS" \
- --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-transport-https" \
+ --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-transport-https,gnupg2" \
--mirror-bootstrap {{debian_mirror}} \
--mirror-chroot {{debian_mirror}} \
--mirror-chroot-security {{debian_security_mirror}} \
@@ -55,9 +55,8 @@ lb config noauto \
--archive-areas "main contrib non-free" \
--firmware-chroot false \
--firmware-binary false \
- --updates false \
+ --updates true \
--security true \
- --apt-options "--yes -oAcquire::Check-Valid-Until=false" \
--apt-indices false
"${@}"
"""
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-25 14:31:29 +0000