[PATCH 1/2] linux-custom.inc: drop library dependencies from kernel headers

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.g...@siemens.com>

The upstream headers do not have dependencies to the runtime libraries.
The ${shlibs:Depends} macro will correctly generate the necessary
dependencies.

libssl is only used in extract-cert which is necessary during the kerneln build
if CONFIG_SYSTEM_TRUSTED_KEYRING is enabled.
This config element is not necessary for the module build
and is therefore removed from the kbuild packages.

Signed-off-by: Quirin Gylstorff <quirin.g...@siemens.com>
---
meta/recipes-kernel/linux/linux-custom.inc | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index 01e9bff7..ca90c4e9 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -35,12 +35,7 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools | linux-initramfs-tool, \
kmod, \
linux-base (>= 4.3~),"

-LIBSSL_DEP = "libssl3"
-LIBSSL_DEP:buster = "libssl1.1"
-LIBSSL_DEP:bullseye = "libssl1.1"
-
-KERNEL_HEADERS_DEBIAN_DEPENDS ?= "libc6, \
- ${LIBSSL_DEP},"
+KERNEL_HEADERS_DEBIAN_DEPENDS ?= ""

KERNEL_LIBC_DEV_ARCH_ALL = "0"
KERNEL_LIBC_DEV_ARCH_ALL:trixie = "1"
--
2.50.1

[Quirin Gylstorff]

From: Quirin Gylstorff <quirin.g...@siemens.com>

The debian macro is ${shlibs:Depends} to generate the shared library
dependencies

Signed-off-by: Quirin Gylstorff <quirin.g...@siemens.com>
---

meta/recipes-kernel/linux/files/debian/control.tmpl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl
index a79b86c4..112ff9bf 100644
--- a/meta/recipes-kernel/linux/files/debian/control.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/control.tmpl
@@ -16,7 +16,7 @@ Description: ${KERNEL_NAME_PROVIDED} Linux kernel, version @KR@
Package: linux-headers-${KERNEL_NAME_PROVIDED}
Build-Profiles: <kernel>
Architecture: any
-Depends: ${KERNEL_HEADERS_DEBIAN_DEPENDS}, ${perl:Depends}, ${shlib:Depends}
+Depends: ${KERNEL_HEADERS_DEBIAN_DEPENDS}, ${perl:Depends}, ${shlibs:Depends}
Description: ${KERNEL_NAME_PROVIDED} Linux kernel headers for @KR@
This package provides kernel header files for @KR@ on ${DISTRO_ARCH}
.
@@ -57,7 +57,7 @@ Description: Linux kernel debugging symbols for @KR@
Package: linux-kbuild-${KERNEL_NAME_PROVIDED}
Build-Profiles: <kbuild !cross>
Architecture: any
-Depends: ${perl:Depends}, ${shlib:Depends}
+Depends: ${perl:Depends}, ${shlibs:Depends}
Description: ${KERNEL_NAME_PROVIDED} Linux kbuild scripts and tools for @KR@
This package provides kernel kbuild scripts and tools for @KR@
This is useful for people who need to build external modules
@@ -66,7 +66,7 @@ Package: linux-kbuild-${KERNEL_NAME_PROVIDED}-${DISTRO_ARCH}-cross
Build-Profiles: <kbuild cross>
Architecture: any
Multi-Arch: foreign
-Depends: ${perl:Depends}, ${shlib:Depends}
+Depends: ${perl:Depends}, ${shlibs:Depends}
Conflicts: linux-kbuild-${KERNEL_NAME_PROVIDED}
Description: ${KERNEL_NAME_PROVIDED} Linux kbuild scripts and tools for @KR@
This package provides kernel kbuild scripts and tools for @KR@
--
2.50.1

[Jan Kiszka]

Patch ordering: Fix the shlibs thing in patch 2 first so that you can
safely drop the THEN no longer needed header deps.

Jan

--
Siemens AG, Foundational Technologies
Linux Expert Center

[Quirin Gylstorff]

--
2.50.1