* [PATCH] meta-toolchain-arago: Allow relocate script to hard code SDK_PATH value @ 2013-05-08 13:18 Franklin S. Cooper Jr 2013-05-08 13:59 ` Denys Dmytriyenko 0 siblings, 1 reply; 5+ messages in thread From: Franklin S. Cooper Jr @ 2013-05-08 13:18 UTC (permalink / raw) To: meta-arago; +Cc: Franklin S. Cooper Jr * SDK_PATH was previously dynamically determined by using BASHISMS when environment-setup was sourced. * Relocate_sdk.py is required to be ran and the script knows the location of the toolchain SDK. * By having the relocate_sdk script set SDK_PATH we remove the need for bashisms from environment-setup. Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com> --- .../meta/meta-toolchain-arago-tisdk.bb | 2 +- .../recipes-core/meta/meta-toolchain-arago-qte.bb | 2 +- .../recipes-core/meta/meta-toolchain-arago.bb | 17 +++++------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb index 114ae1c..68df1bf 100644 --- a/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb +++ b/meta-arago-distro/recipes-core/meta/meta-toolchain-arago-tisdk.bb @@ -4,7 +4,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "libgnutls-dev libgnutls-extra26 libgnutls-openssl require recipes-core/meta/meta-toolchain-arago-qte.bb -PR = "r2" +PR = "r3" toolchain_create_sdk_env_script_append() { echo -e 'export PS1="\[\\e[32;1m\][linux-devkit]\[\\e[0m\]:\w> "' >> $script diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb index 136ebca..207df4f 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago-qte.bb @@ -5,7 +5,7 @@ TOOLCHAIN_SUFFIX ?= "-qte-sdk" require meta-toolchain-arago.bb -PR = "r13" +PR = "r14" QT_DIR_NAME = "qtopia" diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb index 699ada7..7f70c42 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb @@ -7,7 +7,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "" require recipes-core/meta/meta-toolchain.bb -PR = "r23" +PR = "r24" # This function creates an environment-setup-script for use in a deployable SDK toolchain_create_sdk_env_script () { @@ -15,17 +15,7 @@ toolchain_create_sdk_env_script () { script=${SDK_OUTPUT}/${SDKPATH}/environment-setup rm -f $script touch $script - echo 'SDK_PATH="${SDKPATH}"' >> $script - echo 'if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./environment-setup" ]; then' >> $script - echo ' echo "Error: This script needs to be sourced. Please run as \". ./environment-setup\""' >> $script - echo ' exit 1' >> $script - echo 'else' >> $script - echo ' if [ -n "$BASH_SOURCE" ]; then' >> $script - echo ' SDK_PATH="`dirname $BASH_SOURCE`"' >> $script - echo ' fi' >> $script - echo ' SDK_PATH=`readlink -f "$SDK_PATH"`' >> $script - echo ' export SDK_PATH' >> $script - echo 'fi' >> $script + echo 'export SDK_PATH="${SDKPATH}"' >> $script echo 'export SDK_SYS=${SDK_SYS}' >> $script echo 'export TARGET_SYS=${REAL_MULTIMACH_TARGET_SYS}' >> $script echo 'export TOOLCHAIN_SYS=${TOOLCHAIN_SYS}' >> $script @@ -234,6 +224,9 @@ for env_setup_script in `ls $target_sdk_dir/environment-setup*`; do $SUDO_EXEC sed -e "s:$TMPSDKPATH:$target_sdk_dir:g" -i $env_setup_script done +# Correct SDK_PATH since the exact installation path is now known +$SUDO_EXEC sed -i -e "s|export SDK_PATH\=.*|export SDK_PATH=$target_sdk_dir|g" $target_sdk_dir/environment-setup* + # fix dynamic loader paths in all ELF SDK binaries native_sysroot=$target_sdk_dir/sysroots/${SDK_SYS} dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*") -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] meta-toolchain-arago: Allow relocate script to hard code SDK_PATH value 2013-05-08 13:18 [PATCH] meta-toolchain-arago: Allow relocate script to hard code SDK_PATH value Franklin S. Cooper Jr @ 2013-05-08 13:59 ` Denys Dmytriyenko 2013-05-08 14:13 ` Cooper Jr., Franklin 0 siblings, 1 reply; 5+ messages in thread From: Denys Dmytriyenko @ 2013-05-08 13:59 UTC (permalink / raw) To: Franklin S. Cooper Jr; +Cc: meta-arago Franklin, Well, I think I already used up all my weekly quota for reviewing patches yesterday... :) But, Ok. > * SDK_PATH was previously dynamically determined by using BASHISMS when > environment-setup was sourced. But there was still a known good fallback for when not run under bash. > * Relocate_sdk.py is required to be ran and the script knows the location of the > toolchain SDK. > * By having the relocate_sdk script set SDK_PATH we remove the need for > bashisms from environment-setup. It is already doing that, no need to change it. > diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > index 699ada7..7f70c42 100644 > --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > @@ -7,7 +7,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "" > > require recipes-core/meta/meta-toolchain.bb > > -PR = "r23" > +PR = "r24" > > # This function creates an environment-setup-script for use in a deployable SDK > toolchain_create_sdk_env_script () { > @@ -15,17 +15,7 @@ toolchain_create_sdk_env_script () { > script=${SDK_OUTPUT}/${SDKPATH}/environment-setup > rm -f $script > touch $script > - echo 'SDK_PATH="${SDKPATH}"' >> $script > - echo 'if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./environment-setup" ]; then' >> $script > - echo ' echo "Error: This script needs to be sourced. Please run as \". ./environment-setup\""' >> $script > - echo ' exit 1' >> $script This portion above may stay - it's a nice safeguard. And there's nothing bashisms about it. > - echo 'else' >> $script > - echo ' if [ -n "$BASH_SOURCE" ]; then' >> $script > - echo ' SDK_PATH="`dirname $BASH_SOURCE`"' >> $script > - echo ' fi' >> $script I can see potentially removing this portion, since devkit is not relocatable on its own w/o re-installing it in a different location. BTW, this is the only bash-related piece of code here, it just uses bash-specific env variable. If not run under bash, it will safely skip it, so it's not really a bashism. > - echo ' SDK_PATH=`readlink -f "$SDK_PATH"`' >> $script > - echo ' export SDK_PATH' >> $script > - echo 'fi' >> $script And this portion is another nice safeguard - in case you install it in a location that is a symlink. > + echo 'export SDK_PATH="${SDKPATH}"' >> $script > echo 'export SDK_SYS=${SDK_SYS}' >> $script > echo 'export TARGET_SYS=${REAL_MULTIMACH_TARGET_SYS}' >> $script > echo 'export TOOLCHAIN_SYS=${TOOLCHAIN_SYS}' >> $script > @@ -234,6 +224,9 @@ for env_setup_script in `ls $target_sdk_dir/environment-setup*`; do > $SUDO_EXEC sed -e "s:$TMPSDKPATH:$target_sdk_dir:g" -i $env_setup_script > done > > +# Correct SDK_PATH since the exact installation path is now known > +$SUDO_EXEC sed -i -e "s|export SDK_PATH\=.*|export SDK_PATH=$target_sdk_dir|g" $target_sdk_dir/environment-setup* Why do you need this line? It's already happening anyway. -- Denys ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] meta-toolchain-arago: Allow relocate script to hard code SDK_PATH value 2013-05-08 13:59 ` Denys Dmytriyenko @ 2013-05-08 14:13 ` Cooper Jr., Franklin 2013-05-08 14:21 ` Denys Dmytriyenko 0 siblings, 1 reply; 5+ messages in thread From: Cooper Jr., Franklin @ 2013-05-08 14:13 UTC (permalink / raw) To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org > -----Original Message----- > From: Dmytriyenko, Denys > Sent: Wednesday, May 08, 2013 8:59 AM > To: Cooper Jr., Franklin > Cc: meta-arago@arago-project.org > Subject: Re: [meta-arago] [PATCH] meta-toolchain-arago: Allow relocate script > to hard code SDK_PATH value > > Franklin, > > Well, I think I already used up all my weekly quota for reviewing patches > yesterday... :) But, Ok. > > > > * SDK_PATH was previously dynamically determined by using BASHISMS > when > > environment-setup was sourced. > > But there was still a known good fallback for when not run under bash. > > > > * Relocate_sdk.py is required to be ran and the script knows the location of > the > > toolchain SDK. > > * By having the relocate_sdk script set SDK_PATH we remove the need for > > bashisms from environment-setup. > > It is already doing that, no need to change it. > > > > diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > index 699ada7..7f70c42 100644 > > --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > @@ -7,7 +7,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "" > > > > require recipes-core/meta/meta-toolchain.bb > > > > -PR = "r23" > > +PR = "r24" > > > > # This function creates an environment-setup-script for use in a deployable > SDK > > toolchain_create_sdk_env_script () { > > @@ -15,17 +15,7 @@ toolchain_create_sdk_env_script () { > > script=${SDK_OUTPUT}/${SDKPATH}/environment-setup > > rm -f $script > > touch $script > > - echo 'SDK_PATH="${SDKPATH}"' >> $script > > - echo 'if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./environment-setup" ]; > then' >> $script > > - echo ' echo "Error: This script needs to be sourced. Please run as \". > ./environment-setup\""' >> $script > > - echo ' exit 1' >> $script > > This portion above may stay - it's a nice safeguard. And there's nothing > bashisms about it. Your right. I must of gotten delete happy :). > > > > - echo 'else' >> $script > > - echo ' if [ -n "$BASH_SOURCE" ]; then' >> $script > > - echo ' SDK_PATH="`dirname $BASH_SOURCE`"' >> $script > > - echo ' fi' >> $script > > I can see potentially removing this portion, since devkit is not relocatable > on its own w/o re-installing it in a different location. BTW, this is the only > bash-related piece of code here, it just uses bash-specific env variable. If > not run under bash, it will safely skip it, so it's not really a bashism. True but the SDK_PATH would not be the correct value. Current value of SDK_PATH: SDK_PATH=/tmp/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx..../yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy...../ So although no error will be shown the remaining code and variables will be using the incorrect SDK_PATH which results in a lot of issues. > > > > - echo ' SDK_PATH=`readlink -f "$SDK_PATH"`' >> $script > > - echo ' export SDK_PATH' >> $script > > - echo 'fi' >> $script > > And this portion is another nice safeguard - in case you install it in a > location that is a symlink. That makes sense. This can stay also. > > > > + echo 'export SDK_PATH="${SDKPATH}"' >> $script > > echo 'export SDK_SYS=${SDK_SYS}' >> $script > > echo 'export TARGET_SYS=${REAL_MULTIMACH_TARGET_SYS}' >> > $script > > echo 'export TOOLCHAIN_SYS=${TOOLCHAIN_SYS}' >> $script > > @@ -234,6 +224,9 @@ for env_setup_script in `ls > $target_sdk_dir/environment-setup*`; do > > $SUDO_EXEC sed -e "s:$TMPSDKPATH:$target_sdk_dir:g" -i > $env_setup_script > > done > > > > +# Correct SDK_PATH since the exact installation path is now known > > +$SUDO_EXEC sed -i -e "s|export SDK_PATH\=.*|export > SDK_PATH=$target_sdk_dir|g" $target_sdk_dir/environment-setup* > > Why do you need this line? It's already happening anyway. The only way we get the proper value for SDK_PATH is if the following is executed. SDK_PATH="`dirname $BASH_SOURCE`"' >> $script Since I want to remove that logic the above is required. Although the sed statement would change slightly since "SDK_PATH=" will need to be modified instead of "export SDK_PATH=" since I won't be removing a lot of the safe guard logic. > > -- > Denys ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] meta-toolchain-arago: Allow relocate script to hard code SDK_PATH value 2013-05-08 14:13 ` Cooper Jr., Franklin @ 2013-05-08 14:21 ` Denys Dmytriyenko 2013-05-08 14:37 ` Cooper Jr., Franklin 0 siblings, 1 reply; 5+ messages in thread From: Denys Dmytriyenko @ 2013-05-08 14:21 UTC (permalink / raw) To: Cooper Jr., Franklin; +Cc: meta-arago@arago-project.org On Wed, May 08, 2013 at 10:13:19AM -0400, Cooper Jr., Franklin wrote: > > > > -----Original Message----- > > From: Dmytriyenko, Denys > > Sent: Wednesday, May 08, 2013 8:59 AM > > To: Cooper Jr., Franklin > > Cc: meta-arago@arago-project.org > > Subject: Re: [meta-arago] [PATCH] meta-toolchain-arago: Allow relocate script > > to hard code SDK_PATH value > > > > Franklin, > > > > Well, I think I already used up all my weekly quota for reviewing patches > > yesterday... :) But, Ok. > > > > > > > * SDK_PATH was previously dynamically determined by using BASHISMS > > when > > > environment-setup was sourced. > > > > But there was still a known good fallback for when not run under bash. > > > > > > > * Relocate_sdk.py is required to be ran and the script knows the location of > > the > > > toolchain SDK. > > > * By having the relocate_sdk script set SDK_PATH we remove the need for > > > bashisms from environment-setup. > > > > It is already doing that, no need to change it. > > > > > > > diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > > index 699ada7..7f70c42 100644 > > > --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > > +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > > @@ -7,7 +7,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "" > > > > > > require recipes-core/meta/meta-toolchain.bb > > > > > > -PR = "r23" > > > +PR = "r24" > > > > > > # This function creates an environment-setup-script for use in a deployable > > SDK > > > toolchain_create_sdk_env_script () { > > > @@ -15,17 +15,7 @@ toolchain_create_sdk_env_script () { > > > script=${SDK_OUTPUT}/${SDKPATH}/environment-setup > > > rm -f $script > > > touch $script > > > - echo 'SDK_PATH="${SDKPATH}"' >> $script > > > - echo 'if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./environment-setup" ]; > > then' >> $script > > > - echo ' echo "Error: This script needs to be sourced. Please run as \". > > ./environment-setup\""' >> $script > > > - echo ' exit 1' >> $script > > > > This portion above may stay - it's a nice safeguard. And there's nothing > > bashisms about it. > > Your right. I must of gotten delete happy :). > > > > > > > - echo 'else' >> $script > > > - echo ' if [ -n "$BASH_SOURCE" ]; then' >> $script > > > - echo ' SDK_PATH="`dirname $BASH_SOURCE`"' >> $script > > > - echo ' fi' >> $script > > > > I can see potentially removing this portion, since devkit is not relocatable > > on its own w/o re-installing it in a different location. BTW, this is the only > > bash-related piece of code here, it just uses bash-specific env variable. If > > not run under bash, it will safely skip it, so it's not really a bashism. > True but the SDK_PATH would not be the correct value. > Current value of SDK_PATH: > SDK_PATH=/tmp/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx..../yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy...../ > > So although no error will be shown the remaining code and variables will be > using the incorrect SDK_PATH which results in a lot of issues. Nope, it will be updated to the correct install path by relocate_sdk.py, as I already have the necessary sed line in there - your host-setup script was just messing with it... That is what happens when you have too many "smart" scripts :) JK Try it yourself - grab a linux-devkit.sh and install it manually in /tmp, see what SDK_PATH in environment-setup is. Don't run any other host-setup scripts to update environment-setup any further. > > > - echo ' SDK_PATH=`readlink -f "$SDK_PATH"`' >> $script > > > - echo ' export SDK_PATH' >> $script > > > - echo 'fi' >> $script > > > > And this portion is another nice safeguard - in case you install it in a > > location that is a symlink. > That makes sense. This can stay also. > > > > > > > + echo 'export SDK_PATH="${SDKPATH}"' >> $script > > > echo 'export SDK_SYS=${SDK_SYS}' >> $script > > > echo 'export TARGET_SYS=${REAL_MULTIMACH_TARGET_SYS}' >> > > $script > > > echo 'export TOOLCHAIN_SYS=${TOOLCHAIN_SYS}' >> $script > > > @@ -234,6 +224,9 @@ for env_setup_script in `ls > > $target_sdk_dir/environment-setup*`; do > > > $SUDO_EXEC sed -e "s:$TMPSDKPATH:$target_sdk_dir:g" -i > > $env_setup_script > > > done > > > > > > +# Correct SDK_PATH since the exact installation path is now known > > > +$SUDO_EXEC sed -i -e "s|export SDK_PATH\=.*|export > > SDK_PATH=$target_sdk_dir|g" $target_sdk_dir/environment-setup* > > > > Why do you need this line? It's already happening anyway. > The only way we get the proper value for SDK_PATH is if the following is executed. > SDK_PATH="`dirname $BASH_SOURCE`"' >> $script Even w/o this code, SDK_PATH is set to the final installation location in the first line of the script. > Since I want to remove that logic the above is required. Although the sed > statement would change slightly since "SDK_PATH=" will need to be modified > instead of "export SDK_PATH=" since I won't be removing a lot of the safe > guard logic. Again, no changes are required. And the sed line I already have there for updating SDK_PATH doesn't care about "export" portion. -- Denys ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] meta-toolchain-arago: Allow relocate script to hard code SDK_PATH value 2013-05-08 14:21 ` Denys Dmytriyenko @ 2013-05-08 14:37 ` Cooper Jr., Franklin 0 siblings, 0 replies; 5+ messages in thread From: Cooper Jr., Franklin @ 2013-05-08 14:37 UTC (permalink / raw) To: Dmytriyenko, Denys; +Cc: meta-arago@arago-project.org > -----Original Message----- > From: Dmytriyenko, Denys > Sent: Wednesday, May 08, 2013 9:21 AM > To: Cooper Jr., Franklin > Cc: meta-arago@arago-project.org > Subject: Re: [meta-arago] [PATCH] meta-toolchain-arago: Allow relocate script > to hard code SDK_PATH value > > On Wed, May 08, 2013 at 10:13:19AM -0400, Cooper Jr., Franklin wrote: > > > > > > > -----Original Message----- > > > From: Dmytriyenko, Denys > > > Sent: Wednesday, May 08, 2013 8:59 AM > > > To: Cooper Jr., Franklin > > > Cc: meta-arago@arago-project.org > > > Subject: Re: [meta-arago] [PATCH] meta-toolchain-arago: Allow > > > relocate script to hard code SDK_PATH value > > > > > > Franklin, > > > > > > Well, I think I already used up all my weekly quota for reviewing > > > patches yesterday... :) But, Ok. > > > > > > > > > > * SDK_PATH was previously dynamically determined by using BASHISMS > > > when > > > > environment-setup was sourced. > > > > > > But there was still a known good fallback for when not run under bash. > > > > > > > > > > * Relocate_sdk.py is required to be ran and the script knows the > > > > location of > > > the > > > > toolchain SDK. > > > > * By having the relocate_sdk script set SDK_PATH we remove the need for > > > > bashisms from environment-setup. > > > > > > It is already doing that, no need to change it. > > > > > > > > > > diff --git > > > > a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > > b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > > > index 699ada7..7f70c42 100644 > > > > --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > > > +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > > > > @@ -7,7 +7,7 @@ TOOLCHAIN_CLEANUP_PACKAGES ?= "" > > > > > > > > require recipes-core/meta/meta-toolchain.bb > > > > > > > > -PR = "r23" > > > > +PR = "r24" > > > > > > > > # This function creates an environment-setup-script for use in a > > > > deployable > > > SDK > > > > toolchain_create_sdk_env_script () { @@ -15,17 +15,7 @@ > > > > toolchain_create_sdk_env_script () { > > > > script=${SDK_OUTPUT}/${SDKPATH}/environment-setup > > > > rm -f $script > > > > touch $script > > > > - echo 'SDK_PATH="${SDKPATH}"' >> $script > > > > - echo 'if [ -z "$ZSH_NAME" ] && [ "x$0" = "x./environment-setup" ]; > > > then' >> $script > > > > - echo ' echo "Error: This script needs to be sourced. Please run as \". > > > ./environment-setup\""' >> $script > > > > - echo ' exit 1' >> $script > > > > > > This portion above may stay - it's a nice safeguard. And there's > > > nothing bashisms about it. > > > > Your right. I must of gotten delete happy :). > > > > > > > > > > - echo 'else' >> $script > > > > - echo ' if [ -n "$BASH_SOURCE" ]; then' >> $script > > > > - echo ' SDK_PATH="`dirname $BASH_SOURCE`"' >> $script > > > > - echo ' fi' >> $script > > > > > > I can see potentially removing this portion, since devkit is not > > > relocatable on its own w/o re-installing it in a different location. > > > BTW, this is the only bash-related piece of code here, it just uses > > > bash-specific env variable. If not run under bash, it will safely skip it, so it's > not really a bashism. > > True but the SDK_PATH would not be the correct value. > > Current value of SDK_PATH: > > SDK_PATH=/tmp/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx..../ > > yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy...../ > > > > So although no error will be shown the remaining code and variables > > will be using the incorrect SDK_PATH which results in a lot of issues. > > Nope, it will be updated to the correct install path by relocate_sdk.py, as I > already have the necessary sed line in there - your host-setup script was just > messing with it... That is what happens when you have too many "smart" scripts > :) JK > > Try it yourself - grab a linux-devkit.sh and install it manually in /tmp, see what > SDK_PATH in environment-setup is. Don't run any other host-setup scripts to > update environment-setup any further. > > > > > > - echo ' SDK_PATH=`readlink -f "$SDK_PATH"`' >> $script > > > > - echo ' export SDK_PATH' >> $script > > > > - echo 'fi' >> $script > > > > > > And this portion is another nice safeguard - in case you install it > > > in a location that is a symlink. > > That makes sense. This can stay also. > > > > > > > > > > + echo 'export SDK_PATH="${SDKPATH}"' >> $script > > > > echo 'export SDK_SYS=${SDK_SYS}' >> $script > > > > echo 'export TARGET_SYS=${REAL_MULTIMACH_TARGET_SYS}' >> > > > $script > > > > echo 'export TOOLCHAIN_SYS=${TOOLCHAIN_SYS}' >> $script @@ > > > > -234,6 +224,9 @@ for env_setup_script in `ls > > > $target_sdk_dir/environment-setup*`; do > > > > $SUDO_EXEC sed -e "s:$TMPSDKPATH:$target_sdk_dir:g" -i > > > $env_setup_script > > > > done > > > > > > > > +# Correct SDK_PATH since the exact installation path is now known > > > > +$SUDO_EXEC sed -i -e "s|export SDK_PATH\=.*|export > > > SDK_PATH=$target_sdk_dir|g" $target_sdk_dir/environment-setup* > > > > > > Why do you need this line? It's already happening anyway. > > The only way we get the proper value for SDK_PATH is if the following is > executed. > > SDK_PATH="`dirname $BASH_SOURCE`"' >> $script > > Even w/o this code, SDK_PATH is set to the final installation location in the first > line of the script. > > > > Since I want to remove that logic the above is required. Although the sed > > statement would change slightly since "SDK_PATH=" will need to be modified > > instead of "export SDK_PATH=" since I won't be removing a lot of the safe > > guard logic. > > Again, no changes are required. And the sed line I already have there for > updating SDK_PATH doesn't care about "export" portion. Quick test shows that your right. So is there any reason not to remove SDK_PATH="`dirname $BASH_SOURCE`"' >> $script? At the very least since it serves no purpose even if it doesn't harm anything. > > -- > Denys ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-05-08 14:37 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-08 13:18 [PATCH] meta-toolchain-arago: Allow relocate script to hard code SDK_PATH value Franklin S. Cooper Jr 2013-05-08 13:59 ` Denys Dmytriyenko 2013-05-08 14:13 ` Cooper Jr., Franklin 2013-05-08 14:21 ` Denys Dmytriyenko 2013-05-08 14:37 ` Cooper Jr., Franklin
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.