From 21e774d0ae00e166302616addef1caa4df35b0ea Mon Sep 17 00:00:00 2001 From: hbai Date: Tue, 17 May 2022 10:45:31 +0800 Subject: [PATCH] Debian:kernel-signed: Added signed packages into debian_pkg_dirs_sign Added the kernel signed packages into 'debian_pkg_dirs_sign', then these packages can be discovered and built by build-pkgs. This causes the new build type 'sign' created and it has the lowest priority which make sure that the signed packages should be built in the last batch in 'distro' layer. The reason for adding build type 'sign' is also described in the related commit [Add build type sign and set the priority in distro] in starlingx/tools, from https://review.opendev.org/c/starlingx/tools/+/842663 Test Plan: Pass: build-pkgs -a Pass: build-pkgs -a -l Pass: Make sure linux and linux-rt has been built Run the script to sign the kernel build-pkgs -b sign -p kernel-std-signed, kernel-rt-signed Depends-On: https://review.opendev.org/c/starlingx/tools/+/842663 Story: 2009221 Task: 45383 Signed-off-by: Haiqing Bai Change-Id: I4de8c632e2e17d1111e4bce1e246d924be65c373 --- debian_pkg_dirs_sign | 2 ++ kernel-signed/kernel-rt-signed/debian/dl_hook | 2 +- kernel-signed/kernel-std-signed/debian/dl_hook | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 debian_pkg_dirs_sign diff --git a/debian_pkg_dirs_sign b/debian_pkg_dirs_sign new file mode 100644 index 00000000..453e1391 --- /dev/null +++ b/debian_pkg_dirs_sign @@ -0,0 +1,2 @@ +kernel-signed/kernel-rt-signed +kernel-signed/kernel-std-signed diff --git a/kernel-signed/kernel-rt-signed/debian/dl_hook b/kernel-signed/kernel-rt-signed/debian/dl_hook index 98cd0308..000bf07b 100755 --- a/kernel-signed/kernel-rt-signed/debian/dl_hook +++ b/kernel-signed/kernel-rt-signed/debian/dl_hook @@ -26,7 +26,7 @@ mkdir "$1" cd "$1" || exit 1 -file_debian=(../../linux-rt/linux-signed-*.tar.xz) +file_debian=(../../../rt/linux-rt/linux-signed-*.tar.xz) if [ ! -f "${file_debian}" ] then echo "Please create signatures first (e.g. use debian-test-sign)!" diff --git a/kernel-signed/kernel-std-signed/debian/dl_hook b/kernel-signed/kernel-std-signed/debian/dl_hook index ba75e6a4..d51f1b23 100755 --- a/kernel-signed/kernel-std-signed/debian/dl_hook +++ b/kernel-signed/kernel-std-signed/debian/dl_hook @@ -26,7 +26,7 @@ mkdir "$1" cd "$1" || exit 1 -file_debian=(../../linux/linux-signed-*.tar.xz) +file_debian=(../../../std/linux/linux-signed-*.tar.xz) if [ ! -f "${file_debian}" ] then echo "Please create signatures first (e.g. use debian-test-sign)!"