From e83d1a0eabcc11815945453d58e1b9f4e201de43 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 30 Mar 2024 21:12:03 +0100 Subject: [PATCH] kernel-debs: fix: don't try to package linux-libc-dev if only packaging dtb Fixes: 22511b31cf7018de65fce7bf6ae41f88b47b4cfa --- lib/functions/compilation/kernel-debs.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/functions/compilation/kernel-debs.sh b/lib/functions/compilation/kernel-debs.sh index f0d24e34be7a..dfd80e88404e 100644 --- a/lib/functions/compilation/kernel-debs.sh +++ b/lib/functions/compilation/kernel-debs.sh @@ -85,10 +85,12 @@ function prepare_kernel_packaging_debs() { else display_alert "Skipping linux-headers package" "for ${KERNEL_MAJOR_MINOR} kernel version" "info" fi + + display_alert "Packaging linux-libc-dev" "${LINUXFAMILY} ${LINUXCONFIG}" "info" + create_kernel_deb "linux-libc-dev-${BRANCH}-${LINUXFAMILY}" "${debs_target_dir}" kernel_package_callback_linux_libc_dev "linux-libc-dev" fi - display_alert "Packaging linux-libc-dev" "${LINUXFAMILY} ${LINUXCONFIG}" "info" - create_kernel_deb "linux-libc-dev-${BRANCH}-${LINUXFAMILY}" "${debs_target_dir}" kernel_package_callback_linux_libc_dev "linux-libc-dev" + return 0 } function create_kernel_deb() { @@ -535,7 +537,6 @@ function kernel_package_callback_linux_headers() { ) } - function kernel_package_callback_linux_libc_dev() { display_alert "linux-libc-dev packaging" "${package_directory}" "debug" @@ -545,7 +546,7 @@ function kernel_package_callback_linux_libc_dev() { run_host_command_logged mkdir "${package_directory}/usr/include/${HOST_ARCH}" run_host_command_logged mv "${package_directory}/usr/include/asm" "${package_directory}/usr/include/${HOST_ARCH}" - # Generate a control file + # Generate a control file cat <<- CONTROL_FILE > "${package_DEBIAN_dir}/control" Version: ${artifact_version} Maintainer: ${MAINTAINER} <${MAINTAINERMAIL}>