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

Message ID 20240704130725.3050993-1-stefan-koch@siemens.com
State Accepted, archived
Headers show
Series [1/2] linux-custom: Fix arch dependent deploy dirs for linux-libc-dev packages | expand

Commit Message

Koch, Stefan July 4, 2024, 1:07 p.m. UTC
- 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 <stefan-koch@siemens.com>
---
 meta/recipes-kernel/linux/files/debian/isar/common.tmpl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

cedric.hombourger@siemens.com July 5, 2024, 1:12 p.m. UTC | #1
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 <stefan-koch@siemens.com>

Tested-by: Cedric Hombourger <cedric.hombourger@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
Uladzimir Bely July 12, 2024, 6:02 a.m. UTC | #2
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 <stefan-koch@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

Series applied to next, thanks.

Patch

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