Patchwork classes: populate_sdk_base: Refine search for SDK env setup file

login
register
mail settings
Submitter Marc Reilly
Date Aug. 12, 2012, 8:48 a.m.
Message ID <1344761322-10816-1-git-send-email-marc@cpdesign.com.au>
Download mbox | patch
Permalink /patch/34299/
State New
Headers show

Comments

Marc Reilly - Aug. 12, 2012, 8:48 a.m.
This fixes a relocation failure when installing SDKs built with
meta-toolchain-qte.
SDKs build with meta-toolchain-qte have a file named "environment-setup"
in them as well as the environment-setup-MACH-WHATEVER-BLAH file.
This patch changes the find name pattern so that only the appropriate
file is matched.

Signed-off-by: Marc Reilly <marc@cpdesign.com.au>
---
 meta/classes/populate_sdk_base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Laurentiu Palcu - Aug. 13, 2012, 6:50 a.m.
On 08/12/2012 11:48 AM, Marc Reilly wrote:
> This fixes a relocation failure when installing SDKs built with
> meta-toolchain-qte.
> SDKs build with meta-toolchain-qte have a file named "environment-setup"
> in them as well as the environment-setup-MACH-WHATEVER-BLAH file.
> This patch changes the find name pattern so that only the appropriate
> file is matched.
> 
> Signed-off-by: Marc Reilly <marc@cpdesign.com.au>
> ---
>  meta/classes/populate_sdk_base.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
> index 0d19741..60c67bd 100644
> --- a/meta/classes/populate_sdk_base.bbclass
> +++ b/meta/classes/populate_sdk_base.bbclass
> @@ -154,7 +154,7 @@ echo "done"
>  
>  echo -n "Setting it up..."
>  # fix environment paths
> -env_setup_script=$(find $target_sdk_dir -name "environment-setup*")
> +env_setup_script=$(find $target_sdk_dir -name "environment-setup-*")
Good catch! Wouldn't be even better if we used
${REAL_MULTIMACH_TARGET_SYS} instead of *? This way we would match the
exact environment setup script and avoid matching with other scripts.

Thanks,
Laurentiu
>  sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script
>  
>  # fix dynamic loader paths in all ELF SDK binaries
>

Patch

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 0d19741..60c67bd 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -154,7 +154,7 @@  echo "done"
 
 echo -n "Setting it up..."
 # fix environment paths
-env_setup_script=$(find $target_sdk_dir -name "environment-setup*")
+env_setup_script=$(find $target_sdk_dir -name "environment-setup-*")
 sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script
 
 # fix dynamic loader paths in all ELF SDK binaries