Patchwork gcc-cross: Don't reference machine specific variables

login
register
mail settings
Submitter Richard Purdie
Date Jan. 24, 2012, 5:09 p.m.
Message ID <1327424970.19643.99.camel@ted>
Download mbox | patch
Permalink /patch/20063/
State Accepted
Commit b3ca57418f47b16ed0a63d3291bf7d31e3ca5a45
Headers show

Comments

Richard Purdie - Jan. 24, 2012, 5:09 p.m.
gcc-cross is installed into a package architecture specific directory
and is not meant to be machine specific. This patch replaces MACHINE_ARCH
with PACKAGE_ARCH to ensure this is really the case.

This was found by examining sstate checksums.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Khem Raj - Jan. 24, 2012, 5:11 p.m.
On Tue, Jan 24, 2012 at 9:09 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> gcc-cross is installed into a package architecture specific directory
> and is not meant to be machine specific. This patch replaces MACHINE_ARCH
> with PACKAGE_ARCH to ensure this is really the case.
>
> This was found by examining sstate checksums.


This change is fine. Since its only a script name it does not matter
what its called.

Acked-by: Khem Raj <raj.khem@gmail.com>

>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
> index 0b31a8c..6acf8c5 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross.inc
> @@ -87,12 +87,12 @@ then
>        exit 1
>  fi
>        echo "lappend boards_dir [pwd]/../../.." > ${B}/site.exp
> -       echo "load_generic_config \"unix\"" > ${B}/${MACHINE_ARCH}.exp
> -       echo "set_board_info username \$user" >> ${B}/${MACHINE_ARCH}.exp
> -       echo "set_board_info rsh_prog ssh" >> ${B}/${MACHINE_ARCH}.exp
> -       echo "set_board_info rcp_prog scp" >> ${B}/${MACHINE_ARCH}.exp
> -       echo "set_board_info hostname \$target" >> ${B}/${MACHINE_ARCH}.exp
> -       DEJAGNU=${B}/site.exp make -k check RUNTESTFLAGS="--target_board=${MACHINE_ARCH}\$@"
> +       echo "load_generic_config \"unix\"" > ${B}/${PACKAGE_ARCH}.exp
> +       echo "set_board_info username \$user" >> ${B}/${PACKAGE_ARCH}.exp
> +       echo "set_board_info rsh_prog ssh" >> ${B}/${PACKAGE_ARCH}.exp
> +       echo "set_board_info rcp_prog scp" >> ${B}/${PACKAGE_ARCH}.exp
> +       echo "set_board_info hostname \$target" >> ${B}/${PACKAGE_ARCH}.exp
> +       DEJAGNU=${B}/site.exp make -k check RUNTESTFLAGS="--target_board=${PACKAGE_ARCH}\$@"
>
>  STOP
>
>
>
Martin Jansa - Jan. 25, 2012, 1:57 p.m.
On Tue, Jan 24, 2012 at 05:09:30PM +0000, Richard Purdie wrote:
> gcc-cross is installed into a package architecture specific directory
> and is not meant to be machine specific. This patch replaces MACHINE_ARCH
> with PACKAGE_ARCH to ensure this is really the case.
> 
> This was found by examining sstate checksums.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Acked-by: Martin Jansa <Martin.Jansa@gmail.com>

> ---
> diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
> index 0b31a8c..6acf8c5 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross.inc
> @@ -87,12 +87,12 @@ then
>  	exit 1
>  fi
>  	echo "lappend boards_dir [pwd]/../../.." > ${B}/site.exp
> -	echo "load_generic_config \"unix\"" > ${B}/${MACHINE_ARCH}.exp
> -	echo "set_board_info username \$user" >> ${B}/${MACHINE_ARCH}.exp
> -	echo "set_board_info rsh_prog ssh" >> ${B}/${MACHINE_ARCH}.exp
> -	echo "set_board_info rcp_prog scp" >> ${B}/${MACHINE_ARCH}.exp
> -	echo "set_board_info hostname \$target" >> ${B}/${MACHINE_ARCH}.exp
> -	DEJAGNU=${B}/site.exp make -k check RUNTESTFLAGS="--target_board=${MACHINE_ARCH}\$@"
> +	echo "load_generic_config \"unix\"" > ${B}/${PACKAGE_ARCH}.exp
> +	echo "set_board_info username \$user" >> ${B}/${PACKAGE_ARCH}.exp
> +	echo "set_board_info rsh_prog ssh" >> ${B}/${PACKAGE_ARCH}.exp
> +	echo "set_board_info rcp_prog scp" >> ${B}/${PACKAGE_ARCH}.exp
> +	echo "set_board_info hostname \$target" >> ${B}/${PACKAGE_ARCH}.exp
> +	DEJAGNU=${B}/site.exp make -k check RUNTESTFLAGS="--target_board=${PACKAGE_ARCH}\$@"
>  
>  STOP
>  
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 0b31a8c..6acf8c5 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -87,12 +87,12 @@  then
 	exit 1
 fi
 	echo "lappend boards_dir [pwd]/../../.." > ${B}/site.exp
-	echo "load_generic_config \"unix\"" > ${B}/${MACHINE_ARCH}.exp
-	echo "set_board_info username \$user" >> ${B}/${MACHINE_ARCH}.exp
-	echo "set_board_info rsh_prog ssh" >> ${B}/${MACHINE_ARCH}.exp
-	echo "set_board_info rcp_prog scp" >> ${B}/${MACHINE_ARCH}.exp
-	echo "set_board_info hostname \$target" >> ${B}/${MACHINE_ARCH}.exp
-	DEJAGNU=${B}/site.exp make -k check RUNTESTFLAGS="--target_board=${MACHINE_ARCH}\$@"
+	echo "load_generic_config \"unix\"" > ${B}/${PACKAGE_ARCH}.exp
+	echo "set_board_info username \$user" >> ${B}/${PACKAGE_ARCH}.exp
+	echo "set_board_info rsh_prog ssh" >> ${B}/${PACKAGE_ARCH}.exp
+	echo "set_board_info rcp_prog scp" >> ${B}/${PACKAGE_ARCH}.exp
+	echo "set_board_info hostname \$target" >> ${B}/${PACKAGE_ARCH}.exp
+	DEJAGNU=${B}/site.exp make -k check RUNTESTFLAGS="--target_board=${PACKAGE_ARCH}\$@"
 
 STOP