From 1b5e316ce52bd935c2d72e1657a24ca17f53bc57 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 9 May 2022 15:00:40 +0800 Subject: [PATCH] LAT: upgrade to 20220508 The new version mainly supports: - Modify grub.cfg at OS boot time in EFI secure boot - Install multiple kernels to one image For details, in https://github.com/Wind-River/meta-lat the following commits are added: aad9f83 lat-installer: set default kernel and kernel param at OS install time 44a22e5 genimage: do not use real time kernel in installer OS for debian cb3542a genimage: support multiple kernels for debian 170df7d debian/ostree: support multiple kernels 8ec7c6a grub-efi: load kernel.env to choose which kernel to boot 88bcd8a grub-efi: support to modify grub.cfg at OS boot time 4e51daa mttyexec: fix no output to file 25e5d7d mttyexec: fix do_compile error eab4b48 genimage: search root in grub.cfg 5900abe wic: fix EFI of USB's ISO not detected on dell-9010 host 06e6b92 lat installer: add boot parameter efibootfirst=1 95f5d70 lat installer: insert a hook to report error log 5cec871 lat installer && mttyexec: save output of install 452350f lat installer: do not call dhcp for local kickstart 2004330 package-index bbappend: add missing depends task 9cdcb08 lat installer: improve kickstart hook position 9d341a8 lat installer: filter out installer ISO from prompt f7e9bef lat installer: do not install to disk of installer ISO image 774c067 lat installer: fix conflict of multiple installer ISO image Story: 2009964 Task: 45311 PASS - Rebuild LAT container PASS - Build ISO PASS - ISO install on Qemu, PXE EFI install on Edgeline e920t, edit grub.cfg Depends-On: https://review.opendev.org/c/starlingx/integ/+/841120 Signed-off-by: Hongxu Jia Change-Id: Id7f3c6272fdbf40ef87fc8aa512f152e12b4611f --- debian-mirror-tools/config/debian/common/base-bullseye.yaml | 3 +++ stx/dockerfiles/stx-lat-tool.Dockerfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-bullseye.yaml index a9c3a65d1..3627af352 100644 --- a/debian-mirror-tools/config/debian/common/base-bullseye.yaml +++ b/debian-mirror-tools/config/debian/common/base-bullseye.yaml @@ -175,6 +175,7 @@ iso-post-script: | # 2.3.6 Add `Boot from hard drive' entry to grub.cfg cat <> pxeboot/EFI/BOOT/grub.cfg + export skip_check_cfg menuentry 'UEFI Boot from hard drive' { search --set=root --label otaefi configfile /efi/boot/grub.cfg @@ -222,6 +223,8 @@ iso-post-script: | --passphrase-fd 0 \ EFI/BOOT/grub.cfg fi +multiple-kernels: vmlinuz-*-amd64 +default-kernel: vmlinuz-*-amd64 system: - contains: - /localdisk/deploy/lat-initramfs.yaml diff --git a/stx/dockerfiles/stx-lat-tool.Dockerfile b/stx/dockerfiles/stx-lat-tool.Dockerfile index ab8353fa1..bdef3e9b5 100644 --- a/stx/dockerfiles/stx-lat-tool.Dockerfile +++ b/stx/dockerfiles/stx-lat-tool.Dockerfile @@ -16,7 +16,7 @@ FROM debian:bullseye MAINTAINER Chen Qi -ARG LAT_BINARY_RESOURCE_PATH=http://mirror.starlingx.cengn.ca/mirror/lat-sdk/lat-sdk-20220420 +ARG LAT_BINARY_RESOURCE_PATH=http://mirror.starlingx.cengn.ca/mirror/lat-sdk/lat-sdk-20220508 # Install necessary packages RUN apt-get -y update && apt-get --no-install-recommends -y install \