From 7eddfc308a4fd2cee60792dba1bfbf6985f4e3c6 Mon Sep 17 00:00:00 2001 From: tabris Date: Wed, 10 Dec 2025 15:53:26 -0500 Subject: [PATCH 1/4] framework: explicitly add linux-image to armbian-bsp-cli pkg dependencies --- lib/functions/bsp/armbian-bsp-cli-deb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/bsp/armbian-bsp-cli-deb.sh b/lib/functions/bsp/armbian-bsp-cli-deb.sh index b24d1bf48fe8..ef3dbfe8b072 100644 --- a/lib/functions/bsp/armbian-bsp-cli-deb.sh +++ b/lib/functions/bsp/armbian-bsp-cli-deb.sh @@ -282,7 +282,7 @@ function reversion_armbian-bsp-cli_deb_contents() { depends_base_files="" fi cat <<- EOF >> "${control_file_new}" - Depends: bash, linux-base, u-boot-tools, initramfs-tools, lsb-release, fping, device-tree-compiler${depends_base_files} + Depends: bash, linux-base, linux-image, u-boot-tools, initramfs-tools, lsb-release, fping, device-tree-compiler${depends_base_files} Replaces: zram-config, armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME} (<< ${REVISION}) Breaks: armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME} (<< ${REVISION}) Provides: armbian-bsp-cli From 08e9feee39777fe828a5577c5219264eb6724b1a Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 17 Dec 2025 11:47:55 +0800 Subject: [PATCH 2/4] lib / bsp: tighten linux-image dependency of armbian-bsp-cli pkg exclude non-armbian kernels from fulfilling the dependency as there is no guarantee these kernels are in fact bootable on the SBC in question --- lib/functions/bsp/armbian-bsp-cli-deb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/bsp/armbian-bsp-cli-deb.sh b/lib/functions/bsp/armbian-bsp-cli-deb.sh index ef3dbfe8b072..cc62c13f5b71 100644 --- a/lib/functions/bsp/armbian-bsp-cli-deb.sh +++ b/lib/functions/bsp/armbian-bsp-cli-deb.sh @@ -282,7 +282,7 @@ function reversion_armbian-bsp-cli_deb_contents() { depends_base_files="" fi cat <<- EOF >> "${control_file_new}" - Depends: bash, linux-base, linux-image, u-boot-tools, initramfs-tools, lsb-release, fping, device-tree-compiler${depends_base_files} + Depends: bash, linux-base, linux-image-armbian, u-boot-tools, initramfs-tools, lsb-release, fping, device-tree-compiler${depends_base_files} Replaces: zram-config, armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME} (<< ${REVISION}) Breaks: armbian-bsp-cli-${BOARD}${EXTRA_BSP_NAME} (<< ${REVISION}) Provides: armbian-bsp-cli From eabe0e63a49cdfaefc38b6e87182f6c821c13adb Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 17 Dec 2025 11:55:01 +0800 Subject: [PATCH 3/4] lib / bsp: bump up BSP package to 'required' priority the BSP package is priority required not optional as it is required to boot https://www.debian.org/doc/manuals/debian-faq/pkg-basics.en.html#priority --- lib/functions/bsp/armbian-bsp-cli-deb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/functions/bsp/armbian-bsp-cli-deb.sh b/lib/functions/bsp/armbian-bsp-cli-deb.sh index cc62c13f5b71..78735c476b7a 100644 --- a/lib/functions/bsp/armbian-bsp-cli-deb.sh +++ b/lib/functions/bsp/armbian-bsp-cli-deb.sh @@ -83,7 +83,7 @@ function compile_armbian-bsp-cli() { Architecture: $ARCH Maintainer: $MAINTAINER <$MAINTAINERMAIL> Section: kernel - Priority: optional + Priority: required Recommends: bsdutils, parted, util-linux, toilet Description: Armbian CLI BSP for board '${BOARD}' branch '${BRANCH}' ${extra_description[@]} EOF From 2cc6f1673351cb3a22852a147401b25c5ed83eaa Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 17 Dec 2025 12:29:42 +0800 Subject: [PATCH 4/4] lib / kernel-debs: add Conflicts:linux-image to kernel deb pkg we do not want the user to install an upstream kernel package --- lib/functions/compilation/kernel-debs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/functions/compilation/kernel-debs.sh b/lib/functions/compilation/kernel-debs.sh index 4cdb4c0b54ca..012addd09bde 100644 --- a/lib/functions/compilation/kernel-debs.sh +++ b/lib/functions/compilation/kernel-debs.sh @@ -266,6 +266,7 @@ function kernel_package_callback_linux_image() { Section: kernel Priority: optional Provides: linux-image, linux-image-armbian, armbian-$BRANCH, wireguard-modules + Conflicts: linux-image Description: Armbian Linux $BRANCH kernel image $kernel_version_family This package contains the Linux kernel, modules and corresponding other files. ${artifact_version_reason:-"${kernel_version_family}"}