[OE-core] [PATCH 3/4] kern-tools-native: pass LD variable from shell environment to the make call

[Bruce Ashfield]

I'll take this into the repo directly and send a SRCREV bump after
I've run it through a some of my kernel release steps.

Cheers,

Bruce

On Tue, Feb 4, 2020 at 9:42 PM Martin Jansa <martin.jansa at gmail.com> wrote:
>
> * since 5.4 kernel Kconfig will fail immediately when it detects
>   that LD points to gold linker:
>
>   scripts/Kconfig.include:39:  gold linker 'i686-oe-linux-ld' not supported
>
> * in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh
>   but we need to pass it also into the make call here
>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  .../kern-tools/kern-tools-native_git.bb       |  2 ++
>  ...pass-LD-variable-from-shell-environm.patch | 32 +++++++++++++++++++
>  2 files changed, 34 insertions(+)
>  create mode 100644 meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch
>
> diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> index 57ec1abc6d..8053483355 100644
> --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
> @@ -22,3 +22,5 @@ do_install() {
>         cd ${S}/git
>         make DESTDIR=${D}${bindir} install
>  }
> +
> +SRC_URI += "file://0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch;patchdir=git"
> diff --git a/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch b/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch
> new file mode 100644
> index 0000000000..d7d3d9dd2b
> --- /dev/null
> +++ b/meta/recipes-kernel/kern-tools/kern-tools/0001-merge_config.sh-pass-LD-variable-from-shell-environm.patch
> @@ -0,0 +1,32 @@
> +From 091dbfede29c128a1a467d7f3c0aedc33ba3d2cb Mon Sep 17 00:00:00 2001
> +From: Martin Jansa <Martin.Jansa at gmail.com>
> +Date: Wed, 5 Feb 2020 03:26:57 +0100
> +Subject: [PATCH] merge_config.sh: pass LD variable from shell environment to
> + make
> +
> +* since 5.4 kernel Kconfig will fail immediately when it detects
> +  that LD points to gold linker:
> +
> +  scripts/Kconfig.include:39:  gold linker 'i686-oe-linux-ld' not supported
> +
> +* in OE we already pass bfd linker in KERNEL_LD variable to merge_config.sh
> +  but we need to pass it also into the make call here
> +
> +Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> +---
> + tools/merge_config.sh | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/tools/merge_config.sh b/tools/merge_config.sh
> +index 296e759..11f3085 100755
> +--- a/tools/merge_config.sh
> ++++ b/tools/merge_config.sh
> +@@ -153,7 +153,7 @@ fi
> + # Use the merged file as the starting point for:
> + # alldefconfig: Fills in any missing symbols with Kconfig default
> + # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
> +-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
> ++make LD=$LD KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
> +
> +
> + # Check all specified config values took (might have missed-dependency issues)
> --
> 2.20.1
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II