Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH 1/7] toolchain-scripts: run post-relocate scripts for every environment
@ 2019-01-07 16:38 Ross Burton
  2019-01-07 16:38 ` [PATCH 2/7] meson: use a sensible default for libdir when cross-compiling Ross Burton
                   ` (7 more replies)
  0 siblings, 8 replies; 16+ messages in thread
From: Ross Burton @ 2019-01-07 16:38 UTC (permalink / raw)
  To: openembedded-core

SDKs for multilib configurations have multiple environment scripts, so
re-arrange the post-relocate hook invocation so that it runs the post-relocate
hooks after sourcing each environment script.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/toolchain-scripts.bbclass | 46 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 6d1ba69473a..1a2ec4f3b29 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -128,30 +128,30 @@ toolchain_create_post_relocate_script() {
 	touch $relocate_script
 
 	cat >> $relocate_script <<EOF
-# Source top-level SDK env scripts in case they are needed for the relocate
-# scripts.
-for env_setup_script in ${env_dir}/environment-setup-*; do
-    . \$env_setup_script
-    status=\$?
-    if [ \$status != 0 ]; then
-        echo "\$0: Failed to source \$env_setup_script with status \$status"
-        exit \$status
-    fi
-done
-
 if [ -d "${SDKPATHNATIVE}/post-relocate-setup.d/" ]; then
-    for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*; do
-        if [ ! -x \$s ]; then
-            continue
-        fi
-        \$s "\$1"
-        status=\$?
-        if [ \$status != 0 ]; then
-            echo "post-relocate command \"\$s \$1\" failed with status \$status" >&2
-            exit \$status
-        fi
-    done
-    rm -rf "${SDKPATHNATIVE}/post-relocate-setup.d"
+	# Source top-level SDK env scripts in case they are needed for the relocate
+	# scripts.
+	for env_setup_script in ${env_dir}/environment-setup-*; do
+		. \$env_setup_script
+		status=\$?
+		if [ \$status != 0 ]; then
+			echo "\$0: Failed to source \$env_setup_script with status \$status"
+			exit \$status
+		fi
+
+		for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*; do
+			if [ ! -x \$s ]; then
+				continue
+			fi
+			\$s "\$1"
+			status=\$?
+			if [ \$status != 0 ]; then
+				echo "post-relocate command \"\$s \$1\" failed with status \$status" >&2
+				exit \$status
+			fi
+		done
+	done
+	rm -rf "${SDKPATHNATIVE}/post-relocate-setup.d"
 fi
 EOF
 }
-- 
2.11.0



^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2019-01-09  2:56 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-07 16:38 [PATCH 1/7] toolchain-scripts: run post-relocate scripts for every environment Ross Burton
2019-01-07 16:38 ` [PATCH 2/7] meson: use a sensible default for libdir when cross-compiling Ross Burton
2019-01-07 16:38 ` [PATCH 3/7] meson: fix nativesdk-meson for multilib SDKs Ross Burton
2019-01-07 19:03   ` Martin Kelly
2019-01-07 20:02     ` Burton, Ross
2019-01-07 20:07       ` Martin Kelly
2019-01-07 16:38 ` [PATCH 4/7] meson: write correct host endian into SDK cross file Ross Burton
2019-01-07 16:38 ` [PATCH 5/7] oeqa/sdk/cases: clean up DL_DIR handling Ross Burton
2019-01-07 16:38 ` [PATCH 6/7] oeqa/sdk/assimp: cleanup Ross Burton
2019-01-07 16:38 ` [PATCH 7/7] oeqa/sdk: add test to exercise Meson Ross Burton
2019-01-07 16:44   ` Joshua Watt
2019-01-07 16:48     ` Burton, Ross
2019-01-07 17:03 ` ✗ patchtest: failure for "toolchain-scripts: run post-re..." and 6 more Patchwork
2019-01-08 11:01 ` [PATCH 1/7] toolchain-scripts: run post-relocate scripts for every environment Burton, Ross
2019-01-08 13:10   ` Joshua Watt
2019-01-08 13:19     ` Burton, Ross

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox