From 4450ad6028691f409ea98ee502b34430aad845b5 Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Thu, 19 May 2022 15:32:32 +0800 Subject: [PATCH] Debian: update the yaml and lst files to support multi kernels base-bullseye.yaml: Update both std and rt kernels in "multiple-kernels", and set std kernel as the default boot kernel in "default-kernel". And install both std and rt kernels in "rootfs-pre-scripts". Add rt packages into both base-initramfs-bullseye.yaml and stx-std.lst, so all packages are installed into a single image. Test Plan: Pass: build-image --std Pass: boot up, uname -a shows up std kernel Pass: change to rt kernel in /boot/1/kernel.env Pass: reboot, uname -a shows up rt kernel Pass: build-image --rt Pass: boot up, uname -a shows up rt kernel Pass: change to std kernel in /boot/1/kernel.env Pass: reboot, uname -a shows up std kernel Depends-On: https://review.opendev.org/c/starlingx/root/+/842924 Story: 2008846 Task: 45417 Signed-off-by: Yue Tao Change-Id: I499bf51691d4c55bd75441d6ba3ef640da91e49e --- .../config/debian/common/base-bullseye.yaml | 6 +++--- .../debian/common/base-initramfs-bullseye.yaml | 5 +++++ .../config/debian/distro/stx-std.lst | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-bullseye.yaml index 96d390934..6d5f8befd 100644 --- a/debian-mirror-tools/config/debian/common/base-bullseye.yaml +++ b/debian-mirror-tools/config/debian/common/base-bullseye.yaml @@ -42,7 +42,7 @@ rootfs-pre-scripts: chroot $IMAGE_ROOTFS bash << SCRIPT_ENDOF set -e apt update - apt install -y --no-install-recommends linux-image-5.10.0-6-amd64-unsigned grub-common + apt install -y --no-install-recommends linux-image-5.10.0-6-amd64-unsigned linux-rt-image-5.10.0-6-rt-amd64-unsigned grub-common apt install -y --allow-downgrades --allow-unauthenticated --no-install-recommends ostree ostree-boot libostree-1-1 ostree-upgrade-mgr apt install --no-install-recommends -y ifupdown apt install -y bc vim uuid-runtime @@ -222,8 +222,8 @@ iso-post-script: | --passphrase-fd 0 \ EFI/BOOT/grub.cfg fi -multiple-kernels: vmlinuz-*-amd64 -default-kernel: vmlinuz-*-amd64 +multiple-kernels: vmlinuz-*[!t]-amd64 vmlinuz-*-rt-amd64 +default-kernel: vmlinuz-*[!t]-amd64 system: - contains: - /localdisk/deploy/lat-initramfs.yaml diff --git a/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml index 2c1254410..66ab847a0 100644 --- a/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml +++ b/debian-mirror-tools/config/debian/common/base-initramfs-bullseye.yaml @@ -40,8 +40,11 @@ packages: - grub2 - gzip - iavf +- iavf-rt - ice +- ice-rt - i40e +- i40e-rt - ifupdown - initramfs-ostree - iproute2 @@ -51,8 +54,10 @@ packages: - kmod - libostree-1-1=2019.1-1 - linux-image-5.10.0-6-amd64-unsigned +- linux-rt-image-5.10.0-6-rt-amd64-unsigned - mdadm - mlnx-ofed-kernel-modules +- mlnx-ofed-kernel-modules-rt - mount - mttyexec - ostree-boot=2019.1-1 diff --git a/debian-mirror-tools/config/debian/distro/stx-std.lst b/debian-mirror-tools/config/debian/distro/stx-std.lst index 9ff0e67e0..6a6fe71cd 100644 --- a/debian-mirror-tools/config/debian/distro/stx-std.lst +++ b/debian-mirror-tools/config/debian/distro/stx-std.lst @@ -325,18 +325,23 @@ engtools #intel-i40e i40e +i40e-rt #intel-iavf iavf +iavf-rt #intel-ice ice +ice-rt #intel-igb_uio igb-uio +igb-uio-rt #intel-opae-fpga kmod-opae-fpga-driver +kmod-opae-fpga-driver-rt #iptables-config iptables-config @@ -370,18 +375,25 @@ linux-compiler-gcc-10-x86 #linux-cpupower-dbgsym # not used #linux-cpupower # not used linux-headers-5.10.0-6-amd64 +linux-rt-headers-5.10.0-6-rt-amd64 linux-headers-5.10.0-6-common +linux-rt-headers-5.10.0-6-rt-common linux-image-5.10.0-6-amd64-dbg +linux-rt-image-5.10.0-6-rt-amd64-dbg linux-image-5.10.0-6-amd64-unsigned +linux-rt-image-5.10.0-6-rt-amd64-unsigned #linux-image-amd64-dbg # not used #linux-image-amd64-signed-template # not used linux-kbuild-5.10-dbgsym +linux-rt-kbuild-5.10-dbgsym linux-kbuild-5.10 +linux-rt-kbuild-5.10 linux-libc-dev #linux-perf-5.10-dbgsym # not used #linux-perf-5.10 # not used #linux-perf # not used linux-source-5.10 +linux-rt-source-5.10 #linux-source # not used #linux-support-5.10.0-6 # not used #usbip-dbgsym # not used @@ -477,6 +489,7 @@ memcached-custom #mlnx-ofa_kernel mlnx-ofed-kernel-modules +mlnx-ofed-kernel-modules-rt mlnx-ofed-kernel-utils #monitor-helm @@ -885,6 +898,7 @@ python-siteconfig #qat17 qat1.7.l +qat1.7.l-rt #rabbitmq-server rabbitmq-server