From 93bc5bff91b95e5ece01d4722543f73a6a4684f5 Mon Sep 17 00:00:00 2001 From: Li Zhou Date: Wed, 21 Feb 2024 19:45:32 -0800 Subject: [PATCH] Remove kernel abiname in sign_rootfs-post-scripts When kernel is upgraded to 6.6, its abiname is changed from 5.10.0-6 to 6.6.0-1. Update sign_rootfs-post-scripts to remove its dependency on kernel abiname so that we don't need change it any more in next upgrading. Test plan: PASS: The signing build process is verified. PASS: The rt/std secure boot processes on target are verified. Story: 2011000 Task: 49617 Change-Id: I4b9e48d3f89b1097fd5075b20c4c83de7a3c65a8 Signed-off-by: Li Zhou (cherry picked from commit 5b2d40b7bf62c5911d816b9d8783da3c7eeba828) Signed-off-by: Jiping Ma --- build-tools/sign_rootfs-post-scripts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build-tools/sign_rootfs-post-scripts b/build-tools/sign_rootfs-post-scripts index d54ec4d1..9e3d646e 100644 --- a/build-tools/sign_rootfs-post-scripts +++ b/build-tools/sign_rootfs-post-scripts @@ -23,10 +23,12 @@ LOCKD_FILE=LockDown.efi LOCKD_PATH=${IMAGE_ROOTFS}/boot/efi/EFI/BOOT/ LOCKD_INIT=${IMAGE_ROOTFS}/usr/lib/efitools/x86_64-linux-gnu/LockDown.efi - KERNEL_RT_FILE=vmlinuz-5.10.0-6-rt-amd64 KERNEL_RT_PATH=${IMAGE_ROOTFS}/boot/ - KERNEL_FILE=vmlinuz-5.10.0-6-amd64 + KERNEL_RT_FILE=$(ls ${KERNEL_RT_PATH}/vmlinuz-*[0-9]-rt-amd64) + KERNEL_RT_FILE=${KERNEL_RT_FILE##*/} KERNEL_PATH=${IMAGE_ROOTFS}/boot/ + KERNEL_FILE=$(ls ${KERNEL_PATH}/vmlinuz-*[0-9]-amd64) + KERNEL_FILE=${KERNEL_FILE##*/} SSH_OPTION_NOCHECKING="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" REQUEST=$(ssh ${SSH_OPTION_NOCHECKING} ${SIGNING_SERVER} sudo /opt/signing/sign-debian.sh -r) UPLOAD_PATH=${REQUEST#*Upload: }