T7557: Use Debian trixie as build base for container and VyOS image

.github/workflows/trigger_rebuild_packages.yml

@@ -62,8 +62,6 @@ jobs:
               - 'scripts/package-build/linux-kernel/**'
             ndppd:
               - 'scripts/package-build/ndppd/**'
-            net-snmp:
-              - 'scripts/package-build/net-snmp/**'
             netfilter:
               - 'scripts/package-build/netfilter/**'
             node_exporter:
@@ -90,6 +88,8 @@ jobs:
               - 'scripts/package-build/telegraf/**'
             udp-broadcast-relay:
               - 'scripts/package-build/udp-broadcast-relay/**'
+            unionfs-fuse:
+              - 'scripts/package-build/unionfs-fuse/**'
             vpp:
               - 'scripts/package-build/vpp/**'
             waagent:
@@ -191,10 +191,6 @@ jobs:
             trigger_build "ndppd"
           fi
 
-          if [ "${{ steps.changes.outputs.net-snmp }}" == "true" ]; then
-            trigger_build "net-snmp"
-          fi
-
           if [ "${{ steps.changes.outputs.netfilter }}" == "true" ]; then
             trigger_build "netfilter"
           fi
@@ -247,6 +243,10 @@ jobs:
             trigger_build "udp-broadcast-relay"
           fi
 
+          if [ "${{ steps.changes.outputs.unionfs-fuse }}" == "true" ]; then
+            trigger_build "unionfs-fuse"
+          fi
+
           if [ "${{ steps.changes.outputs.vpp }}" == "true" ]; then
             trigger_build "vpp"
           fi

data/architectures/amd64.toml

@@ -14,8 +14,9 @@ packages = [
 
 [additional_repositories.salt]
   architecture = "amd64"
-  url = "https://packages.vyos.net/saltproject/debian/11/amd64/3005"
-  distribution = "bullseye"
+  url = "https://packages.broadcom.com/artifactory/saltproject-deb"
+  distribution = "stable"
 
 [additional_repositories.zabbix]
   url = "https://repo.zabbix.com/zabbix/6.0/debian"
+  distribution = "bookworm"

data/architectures/arm64.toml

@@ -6,8 +6,8 @@ bootloaders = "grub-efi"
 
 [additional_repositories.salt]
   architecture = "arm64"
-  url =	"https://packages.vyos.net/saltproject/debian/11/arm64/3005"
-  distribution = "bullseye"
+  url =	"https://packages.broadcom.com/artifactory/saltproject-deb"
+  distribution = "stable"
 
 [additional_repositories.zabbix]
   url = "https://repo.zabbix.com/zabbix/6.0/debian-arm64"

data/defaults.toml

@@ -2,7 +2,7 @@ build_type = "development"
 
 architecture = "amd64"
 
-debian_distribution = "bookworm"
+debian_distribution = "trixie"
 
 debian_mirror = "http://deb.debian.org/debian"
 debian_security_mirror = "http://deb.debian.org/debian-security"
@@ -14,7 +14,7 @@ vyos_mirror = "https://packages.vyos.net/repositories/current"
 vyos_branch = "current"
 release_train = "current"
 
-kernel_version = "6.6.100"
+kernel_version = "6.12.40"
 kernel_flavor = "vyos"
 bootloaders = "syslinux,grub-efi"
 

data/live-build-config/archives/saltstack.key.chroot

@@ -1,31 +1,41 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
 
-mQENBFOpvpgBCADkP656H41i8fpplEEB8IeLhugyC2rTEwwSclb8tQNYtUiGdna9
-m38kb0OS2DDrEdtdQb2hWCnswxaAkUunb2qq18vd3dBvlnI+C4/xu5ksZZkRj+fW
-tArNR18V+2jkwcG26m8AxIrT+m4M6/bgnSfHTBtT5adNfVcTHqiT1JtCbQcXmwVw
-WbqS6v/LhcsBE//SHne4uBCK/GHxZHhQ5jz5h+3vWeV4gvxS3Xu6v1IlIpLDwUts
-kT1DumfynYnnZmWTGc6SYyIFXTPJLtnoWDb9OBdWgZxXfHEcBsKGha+bXO+m2tHA
-gNneN9i5f8oNxo5njrL8jkCckOpNpng18BKXABEBAAG0MlNhbHRTdGFjayBQYWNr
-YWdpbmcgVGVhbSA8cGFja2FnaW5nQHNhbHRzdGFjay5jb20+iQE4BBMBAgAiBQJT
-qb6YAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAOCKFJ3le/vhkqB/0Q
-WzELZf4d87WApzolLG+zpsJKtt/ueXL1W1KA7JILhXB1uyvVORt8uA9FjmE083o1
-yE66wCya7V8hjNn2lkLXboOUd1UTErlRg1GYbIt++VPscTxHxwpjDGxDB1/fiX2o
-nK5SEpuj4IeIPJVE/uLNAwZyfX8DArLVJ5h8lknwiHlQLGlnOu9ulEAejwAKt9CU
-4oYTszYM4xrbtjB/fR+mPnYh2fBoQO4d/NQiejIEyd9IEEMd/03AJQBuMux62tjA
-/NwvQ9eqNgLw9NisFNHRWtP4jhAOsshv1WW+zPzu3ozoO+lLHixUIz7fqRk38q8Q
-9oNR31KvrkSNrFbA3D89uQENBFOpvpgBCADJ79iH10AfAfpTBEQwa6vzUI3Eltqb
-9aZ0xbZV8V/8pnuU7rqM7Z+nJgldibFk4gFG2bHCG1C5aEH/FmcOMvTKDhJSFQUx
-uhgxttMArXm2c22OSy1hpsnVG68G32Nag/QFEJ++3hNnbyGZpHnPiYgej3FrerQJ
-zv456wIsxRDMvJ1NZQB3twoCqwapC6FJE2hukSdWB5yCYpWlZJXBKzlYz/gwD/Fr
-GL578WrLhKw3UvnJmlpqQaDKwmV2s7MsoZogC6wkHE92kGPG2GmoRD3ALjmCvN1E
-PsIsQGnwpcXsRpYVCoW7e2nW4wUf7IkFZ94yOCmUq6WreWI4NggRcFC5ABEBAAGJ
-AR8EGAECAAkFAlOpvpgCGwwACgkQDgihSd5Xv74/NggA08kEdBkiWWwJZUZEy7cK
-WWcgjnRuOHd4rPeT+vQbOWGu6x4bxuVf9aTiYkf7ZjVF2lPn97EXOEGFWPZeZbH4
-vdRFH9jMtP+rrLt6+3c9j0M8SIJYwBL1+CNpEC/BuHj/Ra/cmnG5ZNhYebm76h5f
-T9iPW9fFww36FzFka4VPlvA4oB7ebBtquFg3sdQNU/MmTVV4jPFWXxh4oRDDR+8N
-1bcPnbB11b5ary99F/mqr7RgQ+YFF0uKRE3SKa7a+6cIuHEZ7Za+zhPaQlzAOZlx
-fuBmScum8uQTrEF5+Um5zkwC7EXTdH1co/+/V/fpOtxIg4XO4kcugZefVm5ERfVS
-MA==
-=dtMN
------END PGP PUBLIC KEY BLOCK-----
+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
+=ZKPF
+-----END PGP PUBLIC KEY BLOCK-----

data/live-build-config/archives/saltstack.pref.chroot

@@ -0,0 +1,3 @@
+Package: salt-*
+Pin: version 3006.*
+Pin-Priority: 1001

data/live-build-config/hooks/live/18-enable-disable_services.chroot

@@ -72,6 +72,10 @@ systemctl disable suricata.service
 systemctl disable vyconfd.service
 systemctl disable vpp.service
 systemctl disable netplug.service
+systemctl disable stunnel4.service
+systemctl disable igmpproxy.service
+systemctl disable wide-dhcpv6-client.service
+systemctl disable qat_service.service
 
 echo I: Enabling services
 systemctl enable vyos-hostsd.service

docker-vyos/Dockerfile

@@ -19,7 +19,7 @@ ARG VYOS_VERSION
 ARG BUILD_DATE
 
 # Use Debian as base layer
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 LABEL authors="VyOS Maintainers <maintainers@vyos.io>"
 ENV DEBIAN_FRONTEND noninteractive

docker/Dockerfile

@@ -18,7 +18,7 @@
 
 # This Dockerfile is installable on both x86, x86-64, armhf and arm64 systems
 ARG ARCH=
-FROM ${ARCH}debian:bookworm-slim
+FROM ${ARCH}debian:trixie-slim
 
 RUN grep "VERSION_ID" /etc/os-release || (echo 'VERSION_ID="12"' >> /etc/os-release)
 
@@ -49,7 +49,7 @@ LABEL authors="VyOS Maintainers <maintainers@vyos.io>" \
       org.opencontainers.image.licenses="GNU" \
       org.opencontainers.image.title="vyos-build" \
       org.opencontainers.image.description="Container to build VyOS ISO" \
-      org.opencontainers.image.base.name="docker.io/debian/debian:bookworm"
+      org.opencontainers.image.base.name="docker.io/debian/debian:trixie"
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN /bin/echo -e 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";' > /etc/apt/apt.conf.d/01norecommends
@@ -106,6 +106,7 @@ RUN apt-get update && apt-get install -y \
       python3-pip \
       python3-flake8 \
       python3-autopep8 \
+      python3-toml \
       python3-tomli \
       python3-tomli-w \
       yq \
@@ -171,7 +172,8 @@ RUN wget -O /tmp/open-vmdk-master.zip https://github.com/vmware/open-vmdk/archiv
 
 # Packages need for build live-build
 RUN apt-get update && apt-get install -y \
-      cpio
+      cpio \
+      debootstrap
 
 COPY patches/live-build/0001-save-package-info.patch /tmp/0001-save-package-info.patch
 
@@ -180,34 +182,14 @@ RUN git clone https://salsa.debian.org/live-team/live-build.git /tmp/live-build
     patch -p1 < /tmp/0001-save-package-info.patch && \
     dch -n "Applying fix for save package info" && \
     dpkg-buildpackage -us -uc && \
-    dpkg -i ../live-build*.deb && \
-    rm -rf /tmp/live-build
-
-#
-# 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 \
-      -O /tmp/a9a603b17cadbf52cb98cde0843dc9f23a08b0da.patch && \
-    git clone https://salsa.debian.org/installer-team/debootstrap /tmp/debootstrap && \
-    cd /tmp/debootstrap && git checkout 1.0.114 && \
-    patch -p1 < /tmp/a9a603b17cadbf52cb98cde0843dc9f23a08b0da.patch && \
-    dch -n "Applying fix for docker image compile" && \
-    dpkg-buildpackage -us -uc && \
-    sudo dpkg -i ../debootstrap*.deb \
-    && rm /tmp/a9a603b17cadbf52cb98cde0843dc9f23a08b0da.patch \
-    && rm -rf /tmp/debootstrap
+    dpkg -i ../live-build*.deb
 
 # FPM is used when generation Debian pckages for e.g. Intel QAT drivers
 RUN gem install --no-document fpm
 
 # Add vyos package repo
 COPY vyos-dev.list /etc/apt/sources.list.d/vyos-dev.list
 COPY vyos-dev.key /usr/share/keyrings/vyos-dev-archive-keyring.gpg
-RUN apt-key add /usr/share/keyrings/vyos-dev-archive-keyring.gpg
 
 # Packages needed for vyos-1x
 RUN pip --no-cache --no-cache-dir install --break-system-packages \
@@ -226,7 +208,8 @@ RUN pip --no-cache --no-cache-dir install --break-system-packages \
       python3-inotify \
       python3-xmltodict \
       python3-lxml \
-      python3-nose \
+      python3-pytest \
+      python3-nose2 \
       python3-netifaces \
       python3-jinja2 \
       python3-jmespath \
@@ -290,13 +273,13 @@ RUN apt-get update && apt-get install -y \
       python3-jsonpatch \
       python3-mock \
       python3-oauthlib \
-      python3-pep8 \
+      # python3-pep8 \        # has no installation candidate (trixie)
       python3-pyflakes \
       python3-serial \
-      python3-unittest2 \
+      # python3-unittest2 \   # Unable to locate package (trixie)
       python3-yaml \
       python3-jsonschema \
-      python3-contextlib2 \
+      # python3-contextlib2 \ # has no installation candidate (trixie)
       python3-pytest-cov \
       cloud-utils
 

docker/vyos-dev.list

@@ -1 +1 @@
-deb https://packages.vyos.net/repositories/current current main
+deb [signed-by=/usr/share/keyrings/vyos-dev-archive-keyring.gpg] https://packages.vyos.net/repositories/current current main

scripts/check-qemu-install

@@ -156,7 +156,7 @@ def get_qemu_cmd(name, enable_uefi, disk_img, raid=None, iso_img=None, tpm=False
         vnc = '-vnc :0'
 
     if enable_uefi:
-        uefi = '-bios /usr/share/OVMF/OVMF_CODE.fd'
+        uefi = '-bios /usr/share/ovmf/OVMF.fd'
         name = f'{name}-UEFI'
 
         if secure_boot:

scripts/image-build/build-vyos-image

@@ -621,13 +621,13 @@ DOCUMENTATION_URL="{build_config['documentation_url']}"
                 --archive-areas "{{debian_archive_areas}}" \
                 --backports true \
                 --binary-image iso-hybrid \
-                --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" \
+                --bootappend-live "boot=live components hostname=vyos username=live nopersistence noautologin nonetworking union=overlay console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0 systemd.gpt_auto=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 systemd.gpt_auto=0" \
                 --bootloaders "{{bootloaders}}" \
                 --checksums "sha256" \
                 --chroot-squashfs-compression-type "{{squashfs_compression_type}}" \
                 --debian-installer none \
-                --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-utils,ca-certificates,gnupg2,linux-kbuild-6.1" \
+                --debootstrap-options "--variant=minbase --exclude=isc-dhcp-client,isc-dhcp-common,ifupdown --include=apt-utils,ca-certificates,gnupg2,linux-kbuild-6.12.38+deb13" \
                 --distribution "{{debian_distribution}}" \
                 --firmware-binary false \
                 --firmware-chroot false \
@@ -681,6 +681,7 @@ Pin-Priority: 600
         print("I: Starting image build")
         if debug:
             print("D: It's not like I'm building this specially for you or anything!")
+
         cmd("lb build 2>&1")
 
         # Copy the image

scripts/package-build/linux-kernel/build-intel-qat.sh

@@ -14,7 +14,7 @@ fi
 
 . ${KERNEL_VAR_FILE}
 
-url="https://packages.vyos.net/source-mirror/QAT.L.4.24.0-00005.tar.gz"
+url="https://packages.vyos.net/source-mirror/QAT.L.4.28.0-00004.tar.gz"
 
 cd ${CWD}
 
@@ -72,7 +72,7 @@ cp quickassist/qat/fw/*.bin ${DEBIAN_DIR}/lib/firmware
 cp build/*.so ${DEBIAN_DIR}/usr/lib/x86_64-linux-gnu
 cp build/adf_ctl ${DEBIAN_DIR}/usr/sbin
 cp quickassist/build_system/build_files/qat_service ${DEBIAN_DIR}/etc/init.d
-cp build/usdm_drv.ko ${DEBIAN_DIR}/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/updates/drivers
+#cp build/usdm_drv.ko ${DEBIAN_DIR}/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/updates/drivers
 chmod 644 ${DEBIAN_DIR}/lib/firmware/*
 chmod 755 ${DEBIAN_DIR}/etc/init.d/* ${DEBIAN_DIR}/usr/local/bin/*
 

scripts/package-build/linux-kernel/build-ipt-netflow.sh

@@ -19,6 +19,13 @@ if [ -d .git ]; then
     git clean --force -d -x
 fi
 
+PATCH_DIR=${CWD}/patches/ipt-netflow
+for patch in $(ls ${PATCH_DIR})
+do
+    echo "I: Apply patch: ${PATCH_DIR}/${patch}"
+    patch -p1 < ${PATCH_DIR}/${patch}
+done
+
 . ${KERNEL_VAR_FILE}
 
 DRIVER_VERSION=$(git describe | sed s/^v//)

scripts/package-build/linux-kernel/build-jool.py

@@ -38,15 +38,15 @@ def add_depends(package_dir: str, package_name: str,
 PACKAGE_VERSION: str = '4.1.9+bf4c7e3669'
 PACKAGE_DIR: str = f'{PACKAGE_NAME}-{PACKAGE_VERSION}'
 SOURCES_ARCHIVE: str = 'jool-4.1.9+bf4c7e3669.tar.gz'
-SOURCES_URL: str = f'https://github.com/NICMx/Jool/archive/7f08c42c615ed63cf0fdc1522d91aa0809f6d990.tar.gz'
+SOURCES_URL: str = f'https://packages.vyos.net/source-mirror/jool-4.1.9+bf4c7e3669.tar.gz'
 
 # download sources
 sources_archive = Path(SOURCES_ARCHIVE)
 sources_archive.write_bytes(get(SOURCES_URL).content)
 
 # prepare sources
 debmake_cmd: list[str] = [
-    'debmake', '-e', 'support@vyos.io', '-f', 'VyOS Support', '-p',
+    'debmake', '-z', 'tar.gz', '-e', 'support@vyos.io', '-f', 'VyOS Support', '-p',
     PACKAGE_NAME, '-u', PACKAGE_VERSION, '-a', SOURCES_ARCHIVE
 ]
 run(debmake_cmd)

scripts/package-build/linux-kernel/build-linux-firmware.sh

@@ -22,7 +22,7 @@ fi
 
 result=()
 # Retrieve firmware blobs from source files
-FW_FILES=$(find ${LINUX_SRC}/debian/linux-image/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/kernel/drivers/net -name *.ko | xargs modinfo | grep "^firmware:" | awk '{print $2}')
+FW_FILES=$(find ${LINUX_SRC}/debian/linux-image-${KERNEL_VERSION}${KERNEL_SUFFIX}/lib/modules/${KERNEL_VERSION}${KERNEL_SUFFIX}/kernel/drivers/net -name *.ko | xargs modinfo | grep "^firmware:" | awk '{print $2}')
 
 # Debian package will use the descriptive Git commit as version
 GIT_COMMIT=$(cd ${CWD}/${LINUX_FIRMWARE}; git describe --always)

scripts/package-build/linux-kernel/build-realtek-r8152.py

@@ -34,16 +34,16 @@ def add_depends(package_dir: str, package_name: str,
 PACKAGE_NAME: str = 'vyos-drivers-realtek-r8152'
 PACKAGE_VERSION: str = '2.18.1'
 PACKAGE_DIR: str = f'{PACKAGE_NAME}-{PACKAGE_VERSION}'
-SOURCES_ARCHIVE: str = 'r8152-2.18.1.tar.bz2'
-SOURCES_URL: str = f'https://packages.vyos.net/source-mirror/r8152-2.18.1.tar.bz2'
+SOURCES_ARCHIVE: str = 'r8152-2.20.1.tar.gz'
+SOURCES_URL: str = 'https://packages.vyos.net/source-mirror/r8152-2.20.1.tar.gz'
 
 # download sources
 sources_archive = Path(SOURCES_ARCHIVE)
 sources_archive.write_bytes(get(SOURCES_URL).content)
 
 # prepare sources
 debmake_cmd: list[str] = [
-    'debmake', '-e', 'support@vyos.io', '-f', 'VyOS Support', '-p',
+    'debmake', '-z', 'tar.gz', '-e', 'support@vyos.io', '-f', 'VyOS Support', '-p',
     PACKAGE_NAME, '-u', PACKAGE_VERSION, '-a', SOURCES_ARCHIVE
 ]
 run(debmake_cmd)