diff mbox series

[2/2] linux-kernel: Fix recipe provides for linux-libc-dev targets

Message ID 862b289b-7978-49ad-9eb0-3fe386f9e258@siemens.com
State Superseded, archived
Headers show
Series [1/2] linux-kernel: Fix building of linux-libc-dev-*-cross packages | expand

Commit Message

Jan Kiszka Dec. 18, 2025, 5:57 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

Avoid the the kbuildtarget also provides linux-libc-dev*. Furthermore,
only provide the cross variant when it is actually built.

While at it, drop the unused :nolibcdev override to avoid confusion.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes-recipe/linux-kernel.bbclass | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/meta/classes-recipe/linux-kernel.bbclass b/meta/classes-recipe/linux-kernel.bbclass
index 4a304833..37299412 100644
--- a/meta/classes-recipe/linux-kernel.bbclass
+++ b/meta/classes-recipe/linux-kernel.bbclass
@@ -140,6 +140,9 @@  BUILD_PROFILES:class-kbuildtarget = "pkg.${BPN}.kbuild"
 RECIPE_PROVIDES:class-kbuildtarget = " \
     linux-headers-${KERNEL_NAME_PROVIDED} \
     linux-kbuild-${KERNEL_NAME_PROVIDED}"
+RECIPE_PROVIDES:remove:class-kbuildtarget = " \
+    linux-libc-dev \
+    linux-libc-dev-${DISTRO_ARCH}-cross"
 # Using DEPENDS instead of RDEPENDS to ensure creation of kernel including
 # pregenerated kernel config before target specific linux-kbuild package build
 DEPENDS:class-kbuildtarget = "${BPN}"
@@ -156,12 +159,12 @@  RECIPE_PROVIDES = " \
 "
 
 # Provide linux-libc-dev packages unless nolibcdev profile used
-OVERRIDES:append = ":${@ bb.utils.contains('DEB_BUILD_PROFILES', 'pkg.{}.nolibcdev'.format(d.getVar('BPN')), 'nolibcdev', 'libcdev', d)}"
+OVERRIDES:append = ":${@ bb.utils.contains('DEB_BUILD_PROFILES', 'pkg.{}.nolibcdev'.format(d.getVar('BPN')), '', 'libcdev', d)}"
 
 RECIPE_PROVIDES:append:libcdev = " \
-    linux-libc-dev \
-    linux-libc-dev-${DISTRO_ARCH}-cross \
-"
+    linux-libc-dev"
+RECIPE_PROVIDES:append:libcdev:cross-profile = " \
+    linux-libc-dev-${DISTRO_ARCH}-cross"
 
 # When cross-profile is active:
 # kbuild package is provided by -native or -kbuildtarget variant. Also headers