toolchain-shar-extract.sh: remove legacy .o files
PATCH 1/2 toolchain-shar-extract.sh: remove legacy .o files
We want to make sure make scripts prepare succeed inside SDK. However, the legacy .o files under scripts/kconfig will introduce build error on some hosts, thus removing them.
--- meta/files/toolchain-shar-extract.sh | 3 +++ 1 file changed, 3 insertions(+)
meta/files/toolchain-shar-extract.sh +3 -0
@@ -286,6 +286,9 @@ if [ -e "$post_relocate" ]; then $SUDO_EXEC rm -f $post_relocate fi +# Remove legacy .o files to avoid kernel build failure +rm -f $target_sdk_dir/sysroots/*/usr/src/kernel/scripts/kconfig/*.o + echo "SDK has been successfully set up and is ready to be used." echo "Each time you wish to use the SDK in a new shell session, you need to source the environment setup script e.g." for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
Signature · 1 line
2.17.1
PATCH 2/2 linux-yocto: add more support for SDK
We need to make scripts prepare inside SDK. So add patch to defect if we are insdie SDK environment, and if so change some PKG_CONFIG_xxx settings so that we will use things from SDK's host part.
The problem for make scripts prepare inside SDK is that the hosts' environments are different. On some hosts, it happens to succeed, and on some hosts, it fails. This is because the build mixes host's part and SDK's host part.
We do such change to make sure only SDK's host part is involed in build.
--- ...port-make-scripts-prepare-inside-SDK.patch | 46 +++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 3 ++ 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-kernel/linux/files/0001-Makefile-support-make-scripts-prepare-inside-SDK.patch
meta/recipes-kernel/linux/files/0001-Makefile-support-make-scripts-prepare-inside-SDK.patch new file +46 -0
@@ -0,0 +1,46 @@ +From e7b37cbdbd0f7dbd3ba99e7db6916c2dc3acecc9 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Thu, 16 Apr 2020 10:06:24 +0000 +Subject: [PATCH] Makefile: support make scripts prepare inside SDK + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <[email protected]> +--- + Makefile | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2f140aa..af41dca 100644 +--- a/Makefile ++++ b/Makefile +@@ -277,6 +277,17 @@ ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),) + endif + endif + ++ifneq ($(SDKTARGETSYSROOT),) ++ ifneq ($(filter scripts prepare, $(MAKECMDGOALS)),) ++ PKG_CONFIG_SYSROOT_DIR = ++ PKG_CONFIG_PATH = $(OECORE_NATIVE_SYSROOT)/usr/lib/pkgconfig:$(OECORE_NATIVE_SYSROOT)/usr/share/pkgconfig ++ export PKG_CONFIG_SYSROOT_DIR ++ export PKG_CONFIG_PATH ++$(info Changed PKG_CONFIG_SYSROOT_DIR to '$(PKG_CONFIG_SYSROOT_DIR)') ++$(info Changed PKG_CONFIG_PATH to '$(PKG_CONFIG_PATH)') ++ endif ++endif ++ + ifneq ($(KBUILD_EXTMOD),) + may-sync-config := + endif +@@ -994,7 +1005,7 @@ mod_sign_cmd = true + endif + export mod_sign_cmd + +-HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) ++HOST_LIBELF_LIBS = $(shell export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH); export PKG_CONFIG_SYSROOT_DIR=$(PKG_CONFIG_SYSROOT_DIR); pkg-config libelf --libs 2>/dev/null || echo -lelf) + + ifdef CONFIG_STACK_VALIDATION + has_libelf := $(call try-run,\ +-- +2.24.1 +
meta/recipes-kernel/linux/linux-yocto.inc +3 -0
@@ -55,3 +55,6 @@ do_install_append(){ # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" + +# Ensure `make scripts prepare` succeed inside SDK +EXTRA_KERNEL_SRC_URI += "file://0001-Makefile-support-make-scripts-prepare-inside-SDK.patch"
Signature · 1 line
2.17.1
Re: [OE-core][PATCH 2/2] linux-yocto: add more support for SDK
Quoted 5 lines · Chen Qi
We need to
make scripts prepareinside SDK. So add patch to defect if we are insdie SDK environment, and if so change somePKG_CONFIG_xxxsettings so that we will use things from SDK's host part.
This needs to be submitted to the linux-yocto mailing list.
We don't carry patches to linux-yocto outside of the tree.
Cheers,
Bruce
Quoted 82 lines
The problem for
make scripts prepareinside SDK is that the hosts' environments are different. On some hosts, it happens to succeed, and on some hosts, it fails. This is because the build mixes host's part and SDK's host part.We do such change to make sure only SDK's host part is involed in build.
Signed-off-by Chen Qi <[email protected]>--- ...port-make-scripts-prepare-inside-SDK.patch | 46 +++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto.inc | 3 ++ 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-kernel/linux/files/0001-Makefile-support-make-scripts-prepare-inside-SDK.patchmeta/recipes-kernel/linux/files/0001-Makefile-support-make-scripts-prepare-inside-SDK.patch new file +46
-0@@ -0,0 +1,46 @@ +From e7b37cbdbd0f7dbd3ba99e7db6916c2dc3acecc9 Mon Sep 17 00:00:00 2001 +From: Chen Qi <[email protected]> +Date: Thu, 16 Apr 2020 10:06:24 +0000 +Subject: [PATCH] Makefile: support make scripts prepare inside SDK + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <[email protected]> +--- + Makefile | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2f140aa..af41dca 100644 +--- a/Makefile ++++ b/Makefile +@@ -277,6 +277,17 @@ ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),) + endif + endif + ++ifneq ($(SDKTARGETSYSROOT),) ++ ifneq ($(filter scripts prepare, $(MAKECMDGOALS)),) ++ PKG_CONFIG_SYSROOT_DIR = ++ PKG_CONFIG_PATH = $(OECORE_NATIVE_SYSROOT)/usr/lib/pkgconfig:$(OECORE_NATIVE_SYSROOT)/usr/share/pkgconfig ++ export PKG_CONFIG_SYSROOT_DIR ++ export PKG_CONFIG_PATH ++$(info Changed PKG_CONFIG_SYSROOT_DIR to '$(PKG_CONFIG_SYSROOT_DIR)') ++$(info Changed PKG_CONFIG_PATH to '$(PKG_CONFIG_PATH)') ++ endif ++endif ++ + ifneq ($(KBUILD_EXTMOD),) + may-sync-config := + endif +@@ -994,7 +1005,7 @@ mod_sign_cmd = true + endif + export mod_sign_cmd + +-HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) ++HOST_LIBELF_LIBS = $(shell export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH); export PKG_CONFIG_SYSROOT_DIR=$(PKG_CONFIG_SYSROOT_DIR); pkg-config libelf --libs 2>/dev/null || echo -lelf) + + ifdef CONFIG_STACK_VALIDATION + has_libelf := $(call try-run,\ +-- +2.24.1 +meta/recipes-kernel/linux/linux-yocto.inc +3
-1@@ -55,3 +55,6 @@ do_install_append(){ # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" + +# Ensure `make scripts prepare` succeed inside SDK +EXTRA_KERNEL_SRC_URI += "file://0001-Makefile-support-make-scripts-prepare-inside-SDK.patch" --2.17.1
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
Quoted 14 lines · Chen Qi
We want to make sure
make scripts preparesucceed inside SDK. However, the legacy .o files underscripts/kconfigwill introduce build error on some hosts, thus removing them.Signed-off-by Chen Qi <[email protected]>--- meta/files/toolchain-shar-extract.sh | 3 +++ 1 file changed, 3 insertions(+)meta/files/toolchain-shar-extract.sh +0
-0
meta/files/toolchain-shar-extract.sh if [ -e "$post_relocate" ]; then · line 291
Quoted 6 lines
meta/files/toolchain-shar-extract.sh +3
-0@@ -286,6 +286,9 @@ if [ -e "$post_relocate" ]; then $SUDO_EXEC rm -f $post_relocate fi +# Remove legacy .o files to avoid kernel build failure +rm -f $target_sdk_dir/sysroots/*/usr/src/kernel/scripts/kconfig/*.o +
We should be removing these at SDK construction time, not at extraction time, then the SDK is smaller and we don't have special cases in this extraction script...
Cheers,
Richard
Thanks for the suggestion. I'll send out V2.
Regards,
Chen Qi
________________________________
From: Richard Purdie <[email protected]>
Sent: Thursday, April 23, 2020 7:19
To: Chen, Qi <[email protected]>; [email protected] <[email protected]>
Subject: Re: [OE-core][PATCH 1/2] toolchain-shar-extract.sh: remove legacy .o files
Quoted 14 lines · Chen Qi
We want to make sure
make scripts preparesucceed inside SDK. However, the legacy .o files underscripts/kconfigwill introduce build error on some hosts, thus removing them.Signed-off-by Chen Qi <[email protected]>--- meta/files/toolchain-shar-extract.sh | 3 +++ 1 file changed, 3 insertions(+)meta/files/toolchain-shar-extract.sh +0
-0
meta/files/toolchain-shar-extract.sh if [ -e "$post_relocate" ]; then · line 291
Quoted 6 lines
meta/files/toolchain-shar-extract.sh +3
-0@@ -286,6 +286,9 @@ if [ -e "$post_relocate" ]; then $SUDO_EXEC rm -f $post_relocate fi +# Remove legacy .o files to avoid kernel build failure +rm -f $target_sdk_dir/sysroots/*/usr/src/kernel/scripts/kconfig/*.o +
We should be removing these at SDK construction time, not at extraction time, then the SDK is smaller and we don't have special cases in this extraction script...
Cheers,
Richard