linux-custom: Add missing Multi-Arch foreign to linux-libc-dev*

Message ID da68c1eb-7e1c-4dc8-b50b-fd3764ce4fe4@siemens.com
State New
Headers show
Series linux-custom: Add missing Multi-Arch foreign to linux-libc-dev* | expand

Commit Message

Jan Kiszka Sept. 11, 2025, 7:54 p.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

This ensures that we create true drop-in replacements of the
respective upstream packages.

Fixes: 90aa31273278 ("linux-custom: generate linux-libc-dev for "all" vs "any" like trixie")
Fixes: 13103ab84d5d ("linux-custom: Generate cross linux-libc-dev package")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-kernel/linux/files/debian/control.tmpl | 1 +
 meta/recipes-kernel/linux/linux-custom.inc          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl
index ec0da1ab..e2a878a9 100644
--- a/meta/recipes-kernel/linux/files/debian/control.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/control.tmpl
@@ -36,6 +36,7 @@  Build-Profiles: <!nolibcdev cross !kbuild>
 Section: devel
 Provides: linux-kernel-headers-${DISTRO_ARCH}-cross
 Architecture: all
+Multi-Arch: foreign
 Description: Linux Kernel Headers for development (for cross-compiling)
  This package provides headers from the Linux kernel.  These headers
  are used by the installed headers for GNU glibc and other system
diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
index 07e49ce7..995279d2 100644
--- a/meta/recipes-kernel/linux/linux-custom.inc
+++ b/meta/recipes-kernel/linux/linux-custom.inc
@@ -224,7 +224,7 @@  def get_additional_build_profiles(d):
         profiles += ' libcdev-arch-all'
     return profiles
 
-KERNEL_LIBC_DEV_ARCH = "${@ bb.utils.contains('DEB_BUILD_PROFILES', 'libcdev-arch-all', 'all', 'any', d) }"
+KERNEL_LIBC_DEV_ARCH = "${@ bb.utils.contains('DEB_BUILD_PROFILES', 'libcdev-arch-all', 'all\nMulti-Arch: foreign', 'any', d) }"
 DEB_BUILD_PROFILES += "${@get_additional_build_profiles(d)}"
 
 do_prepare_build:prepend() {