[PATCH 1/2] linux-custom: Fix arch dependent deploy dirs for linux-libc-dev packages

[Stefan Koch]

- Solved by avoiding setting of not necessary variables
- Wrong architecture was used within /usr/include/ARCH/asm directory
- Solves issue: https://github.com/ilbers/isar/issues/105

Signed-off-by: Stefan Koch <stefa...@siemens.com>
---
meta/recipes-kernel/linux/files/debian/isar/common.tmpl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
index 86af70c5..def8480e 100644
--- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
@@ -18,8 +18,7 @@ KERNEL_PKG_KERN_KBUILD_CROSS=${KERNEL_PKG_KERN_KBUILD}-${DISTRO_ARCH}-cross
# The scripts and tools are always created for host arch
if echo "${DEB_BUILD_PROFILES}" | grep -q -e "cross" -e "kbuild"
then
- eval $(dpkg-architecture -f -A ${DISTRO_ARCH})
- CROSS_COMPILE=${DEB_TARGET_GNU_TYPE}-
+ CROSS_COMPILE=$(dpkg-architecture -f -A ${DISTRO_ARCH} -q DEB_TARGET_GNU_TYPE)-
fi

# Constants
--
2.39.2

[Stefan Koch]

Signed-off-by: Stefan Koch <stefa...@siemens.com>
---

meta/recipes-kernel/linux/files/debian/control.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux/files/debian/control.tmpl b/meta/recipes-kernel/linux/files/debian/control.tmpl
index e0e932a0..04ad0f4f 100644
--- a/meta/recipes-kernel/linux/files/debian/control.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/control.tmpl
@@ -32,7 +32,7 @@ Description: Linux support headers for userspace development
are used by the installed headers for GNU glibc and other system libraries.

Package: linux-libc-dev-${DISTRO_ARCH}-cross
-Build-Profiles: <!nolibcdev cross>
+Build-Profiles: <!nolibcdev cross !kbuild>
Section: devel
Provides: linux-kernel-headers-${DISTRO_ARCH}-cross
Architecture: all
--
2.39.2

[cedric.h...@siemens.com]

On Thu, 2024-07-04 at 15:07 +0200, Stefan Koch wrote:
> - Solved by avoiding setting of not necessary variables
> - Wrong architecture was used within /usr/include/ARCH/asm directory
> - Solves issue: https://github.com/ilbers/isar/issues/105
>
> Signed-off-by: Stefan Koch <stefa...@siemens.com>

Tested-by: Cedric Hombourger <cedric.h...@siemens.com>

(confirmed the issue without the patch and that it is correctly
resolved with that change applied). Thanks!

> ---
>  meta/recipes-kernel/linux/files/debian/isar/common.tmpl | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
> b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
> index 86af70c5..def8480e 100644
> --- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
> +++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
> @@ -18,8 +18,7 @@
> KERNEL_PKG_KERN_KBUILD_CROSS=${KERNEL_PKG_KERN_KBUILD}-
> ${DISTRO_ARCH}-cross
>  # The scripts and tools are always created for host arch
>  if echo "${DEB_BUILD_PROFILES}" | grep -q -e "cross" -e "kbuild"
>  then
> -    eval $(dpkg-architecture -f -A ${DISTRO_ARCH})
> -    CROSS_COMPILE=${DEB_TARGET_GNU_TYPE}-
> +    CROSS_COMPILE=$(dpkg-architecture -f -A ${DISTRO_ARCH} -q
> DEB_TARGET_GNU_TYPE)-
>  fi
>  
>  # Constants

--

Cedric Hombourger
Siemens AG
www.siemens.com