[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Thomas Petazzoni]

From: Mike Frysinger <vapier@gentoo.org>

The copy_toolchain_lib_root helper searches the entire sysroot, but is
only interested in files in certain subdirs.  So rather than waste time
in walking the entire tree, walk the few subdirs at the depth level we
are actually going to be poaching files from.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 toolchain/helpers.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 7f3efaa..1a72ae5 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -22,9 +22,9 @@ copy_toolchain_lib_root = \
 	DESTDIR="$(strip $3)" ; \
  \
 	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
-		find -L . -path "./lib/$${LIB}.*"     -o \
-			  -path "./usr/lib/$${LIB}.*" -o \
-			  -path "./usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*/$${LIB}.*" \
+		find -L \
+			$(for d in lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*; do test -e "$d" && echo $d) \
+			-maxdepth 1 -name "$${LIB}.*" \
 		)` ; \
 	for FILE in $${LIBS} ; do \
 		LIB=`basename $${FILE}`; \
-- 
1.7.4.1

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Yann E. MORIN]

Thomas, Mike, All,

On Sunday 02 October 2011 21:20:17 Thomas Petazzoni wrote:
> From: Mike Frysinger <vapier@gentoo.org>
> 
> The copy_toolchain_lib_root helper searches the entire sysroot, but is
> only interested in files in certain subdirs.  So rather than waste time
> in walking the entire tree, walk the few subdirs at the depth level we
> are actually going to be poaching files from.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  toolchain/helpers.mk |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
> index 7f3efaa..1a72ae5 100644
> --- a/toolchain/helpers.mk
> +++ b/toolchain/helpers.mk
> @@ -22,9 +22,9 @@ copy_toolchain_lib_root = \
>  	DESTDIR="$(strip $3)" ; \
>   \
>  	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
> -		find -L . -path "./lib/$${LIB}.*"     -o \
> -			  -path "./usr/lib/$${LIB}.*" -o \
> -			  -path "./usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*/$${LIB}.*" \
> +		find -L \
> +			$(for d in lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*; do test -e "$d" && echo $d) \

Just by reading the above line:

1) You need to double the '$' here, as it must be interpreted by the shell,
   not by make.

2) Also, the 'for' construct is missing the final 'done':
  for ...; do ...; done

3) You should test for a directory, not for mere existence: test -d "$$d"

4) And you also need to quote the second '$$d', as you do when testing for
   its existence (granteed, not really needed, it's not gonna have a space
   in it, ever, but for consistency, either you quote both, or you quote
   none; I prefer quoting).

So (sorry if the line gets wrapped):
  $$(for d in lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*; do test -e "$$d" && echo "$$d"; done) \

> +			-maxdepth 1 -name "$${LIB}.*" \
>  		)` ; \
>  	for FILE in $${LIBS} ; do \
>  		LIB=`basename $${FILE}`; \

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Arnout Vandecappelle]

On Monday 03 October 2011 00:55:40, Yann E. MORIN wrote:
> Thomas, Mike, All,
> 
> On Sunday 02 October 2011 21:20:17 Thomas Petazzoni wrote:
> > From: Mike Frysinger <vapier@gentoo.org>
> > 
> > The copy_toolchain_lib_root helper searches the entire sysroot, but is
> > only interested in files in certain subdirs.  So rather than waste time
> > in walking the entire tree, walk the few subdirs at the depth level we
> > are actually going to be poaching files from.
> > 
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> > ---
> > 
> >  toolchain/helpers.mk |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
> > index 7f3efaa..1a72ae5 100644
> > --- a/toolchain/helpers.mk
> > +++ b/toolchain/helpers.mk
> > @@ -22,9 +22,9 @@ copy_toolchain_lib_root = \
> > 
> >  	DESTDIR="$(strip $3)" ; \
> >  	
> >   \
> >   
> >  	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
> > 
> > -		find -L . -path "./lib/$${LIB}.*"     -o \
> > -			  -path "./usr/lib/$${LIB}.*" -o \
> > -			  -path "./usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*/$${LIB}.*" \
> > +		find -L \
> > +			$(for d in lib* usr/lib* 
usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*; do
> > test -e "$d" && echo $d) \
> 
> Just by reading the above line:
> 
> 1) You need to double the '$' here, as it must be interpreted by the shell,
>    not by make.
> 
> 2) Also, the 'for' construct is missing the final 'done':
>   for ...; do ...; done
> 
> 3) You should test for a directory, not for mere existence: test -d "$$d"
> 
> 4) And you also need to quote the second '$$d', as you do when testing for
>    its existence (granteed, not really needed, it's not gonna have a space
>    in it, ever, but for consistency, either you quote both, or you quote
>    none; I prefer quoting).
> 
> So (sorry if the line gets wrapped):
>   $$(for d in lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*; do test
> -e "$$d" && echo "$$d"; done) \

 But in fact, all of the above is unnecessary.  lib, usr/lib and 
usr/<prefix>/lib should exist anyway, and the shell will only expand the * to 
existing files or directories.  If you want to limit to directories you can 
simply say

find -L lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib* \

> 
> > +			-maxdepth 1 -name "$${LIB}.*" \

 But just to be safe, you can add a 2>/dev/null

 Oh and the exit code of find is fortunately ignored, else you'd have to add a 
|| true as well.

 So, my proposal is one line less:

+               find -L lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib* \
+                       -maxdepth 1 -name "$${LIB}.*" 2>/dev/null || true \

 Note: completely untested

> > 
> >  		)` ; \
> >  	
> >  	for FILE in $${LIBS} ; do \
> >  	
> >  		LIB=`basename $${FILE}`; \
> 
> Regards,
> Yann E. MORIN.


 Regards,
 Arnout
-- 
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  31BB CF53 8660 6F88 345D  54CC A836 5879 20D7 CF43

[Buildroot] [pull request v2] Pull request for branch for-2011.11/ext-toolchain-updates

[Thomas Petazzoni]

Hello,

Changes since the last posting:

 * Add Acked-by and Reviewed-by tags as given by Yann E. Morin (thanks!)

 * Include comments made by Yann and Arnout on patches 8/9 and 9/9.

Thomas

The following changes since commit ddb8c639c312fd9f65dbb123837c100281495d50:

  libplayer: mark python bindings as broken (2011-10-08 22:39:29 +0200)

are available in the git repository at:
  http://free-electrons.com/~thomas/buildroot.git for-2011.11/ext-toolchain-updates

Mike Frysinger (1):
      toolchain: speed up sysroot lib copying

Thomas De Schampheleire (1):
      toolchain-external: allow specifying extra external libraries

Thomas Petazzoni (7):
      external toolchain: slightly optimize the copy of the toolchain sysroot
      ext-toolchain: Add CodeSourcery SH uClinux 2011.03
      ext-toolchain: Bump version of CodeSourcery MIPS 2011.03
      ext-toolchain: Add CodeSourcery SH GNU/Linux 2011.03
      ext-toolchain: Add CodeSoucery x86 GNU/Linux 2010.09
      ext-toolchain: Take into account Mentor Graphics acquisition of CodeSoucery
      external-toolchain: Slightly optimize toolchain extraction

 toolchain/helpers.mk                     |   10 +-
 toolchain/toolchain-external/Config.in   |  157 ++++++++++++++++++++----------
 toolchain/toolchain-external/ext-tool.mk |   17 +++-
 3 files changed, 127 insertions(+), 57 deletions(-)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/9] external toolchain: slightly optimize the copy of the toolchain sysroot

[Thomas Petazzoni]

The sysroot of an ARM CodeSourcery toolchain takes about 1.4 GB of
space, but 1.1+ GB of this space consists in locale-related
information which Buildroot doesn't use. By skipping the copy of those
unused files, we save quite a bit of time while importing the
toolchain sysroot.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 toolchain/helpers.mk |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 4d90d15..7f3efaa 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -79,6 +79,9 @@ copy_toolchain_lib_root = \
 #    non-default architecture variant is used. Without this, the
 #    compiler fails to find libraries and headers.
 #
+# Note that the 'locale' directories are not copied. They are huge
+# (400+MB) in CodeSourcery toolchains, and they are not really useful.
+#
 # $1: main sysroot directory of the toolchain
 # $2: arch specific sysroot directory of the toolchain
 # $3: arch specific subdirectory in the sysroot
@@ -89,7 +92,7 @@ copy_toolchain_sysroot = \
 	ARCH_SUBDIR="$(strip $3)"; \
 	for i in etc lib sbin usr ; do \
 		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
-			cp -a $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
+			rsync -au --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
 		fi ; \
 	done ; \
 	if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \
-- 
1.7.4.1

[Buildroot] [PATCH 2/9] toolchain-external: allow specifying extra external libraries

[Thomas Petazzoni]

From: Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>

Custom toolchains may provide extra libraries that need to be copied to the
target. This patch adds a configuration option for this.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 toolchain/toolchain-external/Config.in   |    8 ++++++++
 toolchain/toolchain-external/ext-tool.mk |    1 +
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ff7e8db..b6fa9bd 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -322,6 +322,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CXX
 	  support. If you don't know, leave the default value,
 	  Buildroot will tell you if it's correct or not.
 
+config BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS
+	string "Extra toolchain libraries to be copied to target"
+	help
+	  If your external toolchain provides extra libraries that
+	  need to be copied to the target filesystem, enter them
+	  here, separated by spaces. They will be copied to the
+	  target's /lib directory.
+
 endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM
 
 endif # BR2_TOOLCHAIN_EXTERNAL
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index b9d932f..bac39cf 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -51,6 +51,7 @@
 #  of Buildroot is handled identical for the 2 toolchain types.
 
 LIB_EXTERNAL_LIBS=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
+LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
 LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so
 endif
-- 
1.7.4.1

[Buildroot] [PATCH 3/9] ext-toolchain: Add CodeSourcery SH uClinux 2011.03

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 toolchain/toolchain-external/Config.in   |   17 +++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |    3 +++
 2 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index b6fa9bd..ac712ba 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -152,6 +152,22 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
             - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
+	bool "CodeSourcery SH 2011.03"
+	depends on BR2_sh2a
+	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
+	select BR2_LARGEFILE
+	select BR2_INET_RPC
+	select BR2_USE_WCHAR
+	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the SuperH architecture, from CodeSourcery. It
+	  uses gcc 4.5.2, binutils 2.20, uClibc 0.9.30, gdb 7.2.50 and
+	  kernel headers 2.6.38. It has support for
+	  the following variants:
+            - SH2A, uClibc, big endian
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	bool "CodeSourcery SH 2010.09"
 	depends on BR2_sh2a
@@ -223,6 +239,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
+	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index bac39cf..48c11eb 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -191,6 +191,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103),y)
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package8749/public/sh-uclinux/
+TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2
-- 
1.7.4.1

[Buildroot] [PATCH 4/9] ext-toolchain: Bump version of CodeSourcery MIPS 2011.03

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 toolchain/toolchain-external/ext-tool.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 48c11eb..c8a214d 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -180,8 +180,8 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package7401/public/mips-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=mips-4.4-303-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103),y)
-TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package8715/public/mips-linux-gnu/
-TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-53-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
+TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/mips/portal/package9055/public/mips-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=mips-2011.03-93-mips-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/power/portal/package7703/public/powerpc-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-gnu.tar.bz2
-- 
1.7.4.1

[Buildroot] [PATCH 5/9] ext-toolchain: Add CodeSourcery SH GNU/Linux 2011.03

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 toolchain/toolchain-external/Config.in   |   16 ++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |    3 +++
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index ac712ba..c50acc8 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -137,6 +137,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
             - e500mc glibc, 32 bits
             - 970 glibc hard-float, 64 bits
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
+	bool "CodeSourcery SH 2011.03"
+	depends on BR2_sh4a || BR2_sh4aeb
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the SuperH architecture, from CodeSourcery. It
+	  uses gcc 4.5.2, binutils 2.20, glibc 2.13, uClibc 0.9.30,
+	  gdb 7.2.50 and kernel headers 2.6.38. It has support for
+	  the following variants:
+            - SH4A, glibc, little endian
+            - SH4A, glibc, big endian
+            - SH4A, uClibc, little endian
+            - SH4A, uClibc, big endian
+
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
 	bool "CodeSourcery SH 2010.09"
 	depends on BR2_sh4a || BR2_sh4aeb
@@ -238,6 +253,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "mips-linux-gnu"         if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
 	default "powerpc-linux-gnu"      if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
+	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index c8a214d..2662520 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -188,6 +188,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=freescale-2010.09-55-powerpc-linux-gnu-i686-pc-linux-g
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7783/public/sh-linux-gnu/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-45-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/superh/portal/package8759/public/sh-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-37-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package7859/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz2
-- 
1.7.4.1

[Buildroot] [PATCH 6/9] ext-toolchain: Add CodeSoucery x86 GNU/Linux 2010.09

[Thomas Petazzoni]

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 toolchain/toolchain-external/Config.in   |   16 ++++++++++++++++
 toolchain/toolchain-external/ext-tool.mk |    3 +++
 2 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index c50acc8..9fbc224 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -199,6 +199,21 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	  the following variants:
             - SH2A, uClibc, big endian
 
+config BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009
+	bool "CodeSourcery x86/x86_64 2010.09"
+	depends on BR2_i386 || BR2_x86_64
+	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
+	select BR2_INSTALL_LIBSTDCPP
+	help
+	  Toolchain for the x86/x86_64 architectures, from
+	  CodeSourcery. It uses gcc 4.5.1, binutils 2.20, glibc 2.11,
+	  gdb 7.2.50 and kernel headers 2.6.35.2. It has support for
+	  the following variants:
+	    - Intel Pentium 4, glibc, 32 bits
+            - Intel Atom, glibc, 32 bits
+            - Intel Xeon, glibc, 64 bits
+            - Intel Core 2, glibc, 64 bits
+
 config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
 	bool "Blackfin.uclinux.org 2010RC1"
 	depends on BR2_bfin
@@ -256,6 +271,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	default "sh-linux-gnu"           if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	default "sh-uclinux"             if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
+	default "i686-pc-linux-gnu"	 if BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009
 	default "bfin-uclinux"		 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && !BR2_BFIN_FDPIC
 	default "bfin-linux-uclibc"	 if BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1 && BR2_BFIN_FDPIC
 	default $(BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX) \
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 2662520..6e34e05 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -197,6 +197,9 @@ TOOLCHAIN_EXTERNAL_SOURCE=renesas-2010.09-60-sh-uclinux-i686-pc-linux-gnu.tar.bz
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103),y)
 TOOLCHAIN_EXTERNAL_SITE=http://sourcery.mentor.com/sgpp/lite/superh/portal/package8749/public/sh-uclinux/
 TOOLCHAIN_EXTERNAL_SOURCE=renesas-2011.03-36-sh-uclinux-i686-pc-linux-gnu.tar.bz2
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009),y)
+TOOLCHAIN_EXTERNAL_SITE=https://sourcery.mentor.com/sgpp/lite/ia32/portal/package7682/public/i686-pc-linux-gnu/
+TOOLCHAIN_EXTERNAL_SOURCE=ia32-2010.09-44-i686-pc-linux-gnu-i386-linux.tar.bz2
 else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1),y)
 TOOLCHAIN_EXTERNAL_SITE_1   = http://blackfin.uclinux.org/gf/download/frsrelease/501/8378/
 TOOLCHAIN_EXTERNAL_SOURCE_1 = blackfin-toolchain-2010R1-RC4.i386.tar.bz2
-- 
1.7.4.1

[Buildroot] [PATCH 7/9] ext-toolchain: Take into account Mentor Graphics acquisition of CodeSoucery

[Thomas Petazzoni]

Now that CodeSourcery has been bought by Mentor Graphics, the
toolchains are named "Sourcery CodeBench". We rename the config short
description and adjust the help text, but we keep the option name in
order not to break existing configurations.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 toolchain/toolchain-external/Config.in |  130 ++++++++++++++++----------------
 1 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 9fbc224..0a4b922 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -4,85 +4,85 @@ choice
 	prompt "Toolchain"
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201103
-	bool "CodeSourcery ARM 2011.03"
+	bool "Sourcery CodeBench ARM 2011.03"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.5.2, binutils 2.20.51, glibc 2.13 and gdb 7.2.50,
-	  kernel headers 2.6.38. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
+	  2.13 and gdb 7.2.50, kernel headers 2.6.38. It has support
+	  for the following variants:
             - ARMv5TE, little endian, soft-float, glibc
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
-	bool "CodeSourcery ARM 2010.09"
+	bool "Sourcery CodeBench ARM 2010.09"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.5.1, binutils 2.20, glibc 2.11 and gdb 7.2.50,
-	  kernel headers 2.6.35.2. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.5.1, binutils 2.20, glibc
+	  2.11 and gdb 7.2.50, kernel headers 2.6.35.2. It has support
+	  for the following variants:
             - ARMv5TE, little endian, soft-float, glibc
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
-	bool "CodeSourcery ARM 2010q1"
+	bool "Sourcery CodeBench ARM 2010q1"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.4.1, binutils 2.19, glibc 2.11, gdb 7.0.50 and
-	  kernel headers 2.6.32. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
+	  2.11, gdb 7.0.50 and kernel headers 2.6.32. It has support
+	  for the following variants:
              - ARMv5T, little endian, soft-float, glibc
              - ARMv4T, little endian, soft-float, glibc
              - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3
-	bool "CodeSourcery ARM 2009q3"
+	bool "Sourcery CodeBench ARM 2009q3"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.4.1, binutils 2.19, glibc 2.10 and gdb 6.8 and
-	  kernel headers 2.6.30. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
+	  2.10 and gdb 6.8 and kernel headers 2.6.30. It has support
+	  for the following variants:
             - ARMv5T, little endian, soft-float, glibc
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
-	bool "CodeSourcery ARM 2009q1"
+	bool "Sourcery CodeBench ARM 2009q1"
 	depends on BR2_arm
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the ARM architecture, from CodeSourcery. It
-	  uses gcc 4.3.3, binutils 2.19, glibc 2.8 and gdb 6.8 and
-	  kernel headers 2.6.30. It has support for the following
-	  variants:
+	  Sourcery CodeBench toolchain for the ARM architecture, from
+	  Mentor Graphics. It uses gcc 4.3.3, binutils 2.19, glibc 2.8
+	  and gdb 6.8 and kernel headers 2.6.30. It has support for
+	  the following variants:
             - ARMv5T, little endian, soft-float, glibc
             - ARMv4T, little endian, soft-float, glibc
             - ARMv7-A, Thumb 2, little endian, soft-float, glibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
-	bool "CodeSourcery MIPS 2011.03"
+	bool "Sourcery CodeBench MIPS 2011.03"
 	depends on BR2_mips || BR2_mipsel
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the MIPS architecture, from CodeSourcery. It
-	  uses gcc 4.5.2, binutils 2.20.51, glibc 2.13, uClibc 0.9.30
-	  and gdb 7.2.50, kernel headers 2.6.38. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the MIPS architecture, from
+	  Mentor Graphics. It uses gcc 4.5.2, binutils 2.20.51, glibc
+	  2.13, uClibc 0.9.30 and gdb 7.2.50, kernel headers
+	  2.6.38. It has support for the following variants:
             - MIPS32 O32 big endian glibc
             - MIPS32 O32 little endian glibc
             - MIPS32 big endian soft float glibc
@@ -97,15 +97,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201103
             - MIPS32 little endian soft float uclibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
-	bool "CodeSourcery MIPS 4.4"
+	bool "Sourcery CodeBench MIPS 4.4"
 	depends on BR2_mips || BR2_mipsel
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the MIPS architecture, from CodeSourcery. It
-	  uses gcc 4.4.1, binutils 2.19, glibc 2.11, uClibc 0.9.30 and
-	  gdb 7.0, kernel headers 2.6.32. It has support for the
-	  following variants:
+	  Sourcery CodeBench toolchain for the MIPS architecture, from
+	  Mentor Graphics. It uses gcc 4.4.1, binutils 2.19, glibc
+	  2.11, uClibc 0.9.30 and gdb 7.0, kernel headers 2.6.32. It
+	  has support for the following variants:
             - MIPS32 O32 big endian glibc
             - MIPS32 O32 little endian glibc
             - MIPS32 big endian soft float glibc
@@ -120,15 +120,15 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
             - MIPS32 little endian soft float uclibc
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
-	bool "CodeSourcery PowerPC 2010.09"
+	bool "Sourcery CodeBench PowerPC 2010.09"
 	depends on BR2_powerpc
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the PowerPC architecture, from
-	  CodeSourcery. It uses gcc 4.5.1, binutils 2.20, glibc 2.11,
-	  gdb 7.2.50 and kernel headers 2.6.35.2. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the PowerPC architecture,
+	  from Sourcery CodeBench. It uses gcc 4.5.1, binutils 2.20,
+	  glibc 2.11, gdb 7.2.50 and kernel headers 2.6.35.2. It has
+	  support for the following variants:
             - 603 glibc, 32 bits
             - 603 soft float glibc, 32 bits
             - e600 altivec glibc, 32 bits
@@ -138,37 +138,37 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
             - 970 glibc hard-float, 64 bits
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
-	bool "CodeSourcery SH 2011.03"
+	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh4a || BR2_sh4aeb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the SuperH architecture, from CodeSourcery. It
-	  uses gcc 4.5.2, binutils 2.20, glibc 2.13, uClibc 0.9.30,
-	  gdb 7.2.50 and kernel headers 2.6.38. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
+	  glibc 2.13, uClibc 0.9.30, gdb 7.2.50 and kernel headers
+	  2.6.38. It has support for the following variants:
             - SH4A, glibc, little endian
             - SH4A, glibc, big endian
             - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
-	bool "CodeSourcery SH 2010.09"
+	bool "Sourcery CodeBench SH 2010.09"
 	depends on BR2_sh4a || BR2_sh4aeb
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the SuperH architecture, from CodeSourcery. It
-	  uses gcc 4.5.1, binutils 2.20, glibc 2.11, uClibc 0.9.30,
-	  gdb 7.2.50 and kernel headers 2.6.35.2. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
+	  glibc 2.11, uClibc 0.9.30, gdb 7.2.50 and kernel headers
+	  2.6.35.2. It has support for the following variants:
             - SH4A, glibc, little endian
             - SH4A, glibc, big endian
             - SH4A, uClibc, little endian
             - SH4A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
-	bool "CodeSourcery SH 2011.03"
+	bool "Sourcery CodeBench SH 2011.03"
 	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE
@@ -177,14 +177,14 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the SuperH architecture, from CodeSourcery. It
-	  uses gcc 4.5.2, binutils 2.20, uClibc 0.9.30, gdb 7.2.50 and
-	  kernel headers 2.6.38. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
+	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.38. It has
+	  support for the following variants:
             - SH2A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
-	bool "CodeSourcery SH 2010.09"
+	bool "Sourcery CodeBench SH 2010.09"
 	depends on BR2_sh2a
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_LARGEFILE
@@ -193,22 +193,22 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the SuperH architecture, from CodeSourcery. It
-	  uses gcc 4.5.1, binutils 2.20, uClibc 0.9.30, gdb 7.2.50 and
-	  kernel headers 2.6.35.2. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the SuperH architecture,
+	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
+	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.35.2. It
+	  has support for the following variants:
             - SH2A, uClibc, big endian
 
 config BR2_TOOLCHAIN_EXTERNAL_CODESOUCERY_X86_201009
-	bool "CodeSourcery x86/x86_64 2010.09"
+	bool "Sourcery CodeBench x86/x86_64 2010.09"
 	depends on BR2_i386 || BR2_x86_64
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_INSTALL_LIBSTDCPP
 	help
-	  Toolchain for the x86/x86_64 architectures, from
-	  CodeSourcery. It uses gcc 4.5.1, binutils 2.20, glibc 2.11,
-	  gdb 7.2.50 and kernel headers 2.6.35.2. It has support for
-	  the following variants:
+	  Sourcery CodeBench toolchain for the x86/x86_64
+	  architectures, from Mentor Graphics. It uses gcc 4.5.1,
+	  binutils 2.20, glibc 2.11, gdb 7.2.50 and kernel headers
+	  2.6.35.2. It has support for the following variants:
 	    - Intel Pentium 4, glibc, 32 bits
             - Intel Atom, glibc, 32 bits
             - Intel Xeon, glibc, 64 bits
-- 
1.7.4.1

[Buildroot] [PATCH 8/9] external-toolchain: Slightly optimize toolchain extraction

[Thomas Petazzoni]

Some CodeSourcery toolchains contain a huge number of locales that are
not useful, even though they account for 70-80% of the total toolchain
size. By skipping the extraction of those useless locales, we make the
toolchain extraction process slightly faster, and also make the output
directory size a lot smaller (host/opt/ is 213 MB instead of 1.5 GB
with a 2010.09 ARM CodeSourcery toolchain).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 toolchain/toolchain-external/ext-tool.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index 6e34e05..8287916 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -250,7 +250,8 @@ $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE):
 
 $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
 	mkdir -p $(@D)
-	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
+	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | \
+		$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(@D) $(TAR_OPTIONS) -
 	$(Q)touch $@
 endif
 
-- 
1.7.4.1

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Thomas Petazzoni]

From: Mike Frysinger <vapier@gentoo.org>

The copy_toolchain_lib_root helper searches the entire sysroot, but is
only interested in files in certain subdirs.  So rather than waste time
in walking the entire tree, walk the few subdirs at the depth level we
are actually going to be poaching files from.

Some simplification suggested by Yann E. MORIN
<yann.morin.1998@anciens.enib.fr> and Arnout Vandecappelle
<arnout@mind.be>, added by Thomas Petazzoni
<thomas.petazzoni@free-electrons.com>.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 toolchain/helpers.mk |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 7f3efaa..5585f45 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -22,9 +22,8 @@ copy_toolchain_lib_root = \
 	DESTDIR="$(strip $3)" ; \
  \
 	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
-		find -L . -path "./lib/$${LIB}.*"     -o \
-			  -path "./usr/lib/$${LIB}.*" -o \
-			  -path "./usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*/$${LIB}.*" \
+		find -L lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib* \
+			-maxdepth 1 -name "$${LIB}.*" 2>/dev/null \
 		)` ; \
 	for FILE in $${LIBS} ; do \
 		LIB=`basename $${FILE}`; \
-- 
1.7.4.1

[Buildroot] [PATCH 8/9] external-toolchain: Slightly optimize toolchain extraction

[Yann E. MORIN]

Thomas, All,

On Sunday 09 October 2011 19:44:31 Thomas Petazzoni wrote:
> Some CodeSourcery toolchains contain a huge number of locales that are
> not useful, even though they account for 70-80% of the total toolchain
> size. By skipping the extraction of those useless locales, we make the
> toolchain extraction process slightly faster, and also make the output
> directory size a lot smaller (host/opt/ is 213 MB instead of 1.5 GB
> with a 2010.09 ARM CodeSourcery toolchain).
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Rewviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

> ---
>  toolchain/toolchain-external/ext-tool.mk |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
> index 6e34e05..8287916 100644
> --- a/toolchain/toolchain-external/ext-tool.mk
> +++ b/toolchain/toolchain-external/ext-tool.mk
> @@ -250,7 +250,8 @@ $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE):
>  
>  $(TOOLCHAIN_EXTERNAL_DIR)/.extracted: $(DL_DIR)/$(TOOLCHAIN_EXTERNAL_SOURCE)
>  	mkdir -p $(@D)
> -	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
> +	$(INFLATE$(suffix $(TOOLCHAIN_EXTERNAL_SOURCE))) $^ | \
> +		$(TAR) $(TAR_STRIP_COMPONENTS)=1 --exclude='usr/lib/locale/*' -C $(@D) $(TAR_OPTIONS) -
>  	$(Q)touch $@
>  endif
>  
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Yann E. MORIN]

Thomas, All,

On Sunday 09 October 2011 19:44:32 Thomas Petazzoni wrote:
> From: Mike Frysinger <vapier@gentoo.org>
> 
> The copy_toolchain_lib_root helper searches the entire sysroot, but is
> only interested in files in certain subdirs.  So rather than waste time
> in walking the entire tree, walk the few subdirs at the depth level we
> are actually going to be poaching files from.
> 
> Some simplification suggested by Yann E. MORIN
> <yann.morin.1998@anciens.enib.fr> and Arnout Vandecappelle
> <arnout@mind.be>, added by Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com>.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

BTW, what's the policy when replying: should I also CC: Mike, as he's
the original author, or just the person that submitted the patch?

Regards,
Yann E. MORIN.

> ---
>  toolchain/helpers.mk |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
> index 7f3efaa..5585f45 100644
> --- a/toolchain/helpers.mk
> +++ b/toolchain/helpers.mk
> @@ -22,9 +22,8 @@ copy_toolchain_lib_root = \
>  	DESTDIR="$(strip $3)" ; \
>   \
>  	LIBS=`(cd $${ARCH_SYSROOT_DIR}; \
> -		find -L . -path "./lib/$${LIB}.*"     -o \
> -			  -path "./usr/lib/$${LIB}.*" -o \
> -			  -path "./usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib*/$${LIB}.*" \
> +		find -L lib* usr/lib* usr/$(TOOLCHAIN_EXTERNAL_PREFIX)/lib* \
> +			-maxdepth 1 -name "$${LIB}.*" 2>/dev/null \
>  		)` ; \
>  	for FILE in $${LIBS} ; do \
>  		LIB=`basename $${FILE}`; \
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/9] external toolchain: slightly optimize the copy of the toolchain sysroot

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 Thomas> @@ -89,7 +92,7 @@ copy_toolchain_sysroot = \
 Thomas>  	ARCH_SUBDIR="$(strip $3)"; \
 Thomas>  	for i in etc lib sbin usr ; do \
 Thomas>  		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
 Thomas> -			cp -a $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \
 Thomas> +			rsync -au --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \

FYI, this breaks on readonly source directories unless you have the new
rsync 3.0.9, which most people don't. I haven't figured out a good fix
for older rsync versions yet.


-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Mike Frysinger]

On Sunday 09 October 2011 17:46:21 Yann E. MORIN wrote:
> On Sunday 09 October 2011 19:44:32 Thomas Petazzoni wrote:
> > From: Mike Frysinger <vapier@gentoo.org>
> > 
> > The copy_toolchain_lib_root helper searches the entire sysroot, but is
> > only interested in files in certain subdirs.  So rather than waste time
> > in walking the entire tree, walk the few subdirs at the depth level we
> > are actually going to be poaching files from.
> > 
> > Some simplification suggested by Yann E. MORIN
> > <yann.morin.1998@anciens.enib.fr> and Arnout Vandecappelle
> > <arnout@mind.be>, added by Thomas Petazzoni
> > <thomas.petazzoni@free-electrons.com>.
> > 
> > Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> 
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
> 
> BTW, what's the policy when replying: should I also CC: Mike, as he's
> the original author, or just the person that submitted the patch?

i'm just lurking now for buildroot as i'm not working on it anymore, but this 
looks fine
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20111009/b71d9123/attachment.asc>

[Buildroot] [PATCH 1/9] external toolchain: slightly optimize the copy of the toolchain sysroot

[Thomas Petazzoni]

Le Mon, 10 Oct 2011 00:00:56 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

> FYI, this breaks on readonly source directories unless you have the new
> rsync 3.0.9, which most people don't. I haven't figured out a good fix
> for older rsync versions yet.

Do you have some details ?

Because:

$ rsync --version | grep version
rsync  version 3.0.7  protocol version 30
$ ls -lR toto/
toto/:
total 4
-r--r--r-- 1 thomas thomas    0 2011-10-10 08:41 b
dr-xr-xr-x 2 thomas thomas 4096 2011-10-10 08:41 titi

toto/titi:
total 0
-r--r--r-- 1 thomas thomas 0 2011-10-10 08:41 a
$ mkdir plop
$ rsync -au toto/ plop/

And it works just fine.

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Thomas Petazzoni]

Le Sun, 9 Oct 2011 22:25:40 -0400,
Mike Frysinger <vapier@gentoo.org> a ?crit :

> i'm just lurking now for buildroot as i'm not working on it anymore, but this 
> looks fine

Just curious, is there any specific reason why you gave up working on
Buildroot for the Blackfin architecture?

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/9] external toolchain: slightly optimize the copy of the toolchain sysroot

[Thomas Petazzoni]

Le Mon, 10 Oct 2011 08:43:34 +0200,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> a ?crit :

> $ rsync --version | grep version
> rsync  version 3.0.7  protocol version 30

Ok, I saw the discussion on IRC. The problem seems to be with rsync
3.0.8 only. Older versions and newer versions are unaffected. The
reference discussed on IRC was:
http://lists.samba.org/archive/rsync/2011-May/026369.html.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/9] external toolchain: slightly optimize the copy of the toolchain sysroot

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Le Mon, 10 Oct 2011 00:00:56 +0200,
 Thomas> Peter Korsgaard <jacmet@uclibc.org> a ?crit :

 >> FYI, this breaks on readonly source directories unless you have the new
 >> rsync 3.0.9, which most people don't. I haven't figured out a good fix
 >> for older rsync versions yet.

 Thomas> Do you have some details ?

Sorry, I looked wrong - I read it as if it had never worked, but it was
actually a bug in 3.0.8.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 8/9] external-toolchain: Slightly optimize toolchain extraction

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Some CodeSourcery toolchains contain a huge number of locales that are
 Thomas> not useful, even though they account for 70-80% of the total toolchain
 Thomas> size. By skipping the extraction of those useless locales, we make the
 Thomas> toolchain extraction process slightly faster, and also make the output
 Thomas> directory size a lot smaller (host/opt/ is 213 MB instead of 1.5 GB
 Thomas> with a 2010.09 ARM CodeSourcery toolchain).

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> From: Mike Frysinger <vapier@gentoo.org>
 Thomas> The copy_toolchain_lib_root helper searches the entire sysroot, but is
 Thomas> only interested in files in certain subdirs.  So rather than waste time
 Thomas> in walking the entire tree, walk the few subdirs at the depth level we
 Thomas> are actually going to be poaching files from.

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Mike Frysinger]

On Monday 10 October 2011 02:44:24 Thomas Petazzoni wrote:
> Le Sun, 9 Oct 2011 22:25:40 -0400, Mike Frysinger a ?crit :
> > i'm just lurking now for buildroot as i'm not working on it anymore, but
> > this looks fine
> 
> Just curious, is there any specific reason why you gave up working on
> Buildroot for the Blackfin architecture?

i no longer work for ADI :)

the people who still do are using buildroot for Blackfin, but sadly, they were 
(are?) not as active as i in pushing upstream
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20111010/6221bc87/attachment.asc>

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Thomas Petazzoni]

Le Mon, 10 Oct 2011 11:12:16 -0400,
Mike Frysinger <vapier@gentoo.org> a ?crit :

> > Just curious, is there any specific reason why you gave up working on
> > Buildroot for the Blackfin architecture?
> 
> i no longer work for ADI :)

That's a good explanation.

> the people who still do are using buildroot for Blackfin, but sadly, they were 
> (are?) not as active as i in pushing upstream

Ah, that's a shame, because your contributions were very interesting.
Do those people have a public tree where we can follow their
development and possibly upstream some of it ?

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Mike Frysinger]

On Monday 10 October 2011 11:19:19 Thomas Petazzoni wrote:
> Le Mon, 10 Oct 2011 11:12:16 -0400, Mike Frysinger a ?crit :
> > the people who still do are using buildroot for Blackfin, but sadly, they
> > were (are?) not as active as i in pushing upstream
> 
> Ah, that's a shame, because your contributions were very interesting.
> Do those people have a public tree where we can follow their
> development and possibly upstream some of it ?

yes & no.  it's supposed to be here:
	http://blackfin.uclinux.org/git/?p=buildroot

but it seems they haven't published their internal development tree yet, and i 
obviously cannot do that for them
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20111010/cae6714b/attachment.asc>

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Thomas Petazzoni]

Le Mon, 10 Oct 2011 11:22:48 -0400,
Mike Frysinger <vapier@gentoo.org> a ?crit :

> yes & no.  it's supposed to be here:
> 	http://blackfin.uclinux.org/git/?p=buildroot
> 
> but it seems they haven't published their internal development tree yet, and i 
> obviously cannot do that for them

Ok, too bad. Is there a way for us to have a contact in this team, so
we can tell our interest in seeing their developments merged upstream?

Thanks!

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 9/9] toolchain: speed up sysroot lib copying

[Mike Frysinger]

On Monday 10 October 2011 11:29:52 Thomas Petazzoni wrote:
> Le Mon, 10 Oct 2011 11:22:48 -0400, Mike Frysinger a ?crit :
> > yes & no.  it's supposed to be here:
> > 	http://blackfin.uclinux.org/git/?p=buildroot
> > 
> > but it seems they haven't published their internal development tree yet,
> > and i obviously cannot do that for them
> 
> Ok, too bad. Is there a way for us to have a contact in this team, so
> we can tell our interest in seeing their developments merged upstream?

uclinux-dist-devel at blackfin.uclinux.org is the general development mailing list
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20111010/5a3c4b41/attachment-0001.asc>