Skip to contentSkip to conversation

fixup version strings after GPL compliance issue in binutils and gdb

PATCH New Yann E. MORIN 2 participants 7 messages Sep 11, 2011

lore
Share & tools
lore
#0 lore raw

cover fixup version strings after GPL compliance issue in binutils and gdb

Hello All!

Recently, a GPL compliance issue was found in binutils and gdb (and emacs, but who cares? ;-)). This patchset is an attempt at fixing this issue. More info is available in each patch's commit message.

[PATCH 1/4] package/binutils: fixup version strings 1/2 [PATCH 2/4] package/binutils: fixup version strings 2/2 [PATCH 3/4] toolchain/gdb: strip tarball component when extracting [PATCH 4/4] toolchain/gdb: fixup version strings

Regards,
Yann E. MORIN.

#1 lore raw

PATCH 1/4 package/binutils: fixup version strings 1/2

The binutils tarballs have been re-released after a GPL compliance issue was found:
http://sourceware.org/ml/binutils/2011-08/msg00198.html

So all versions were re-packaged.

In the process, two things happenned:
- some versions (eg. 2.19) went missing, due to them being super-seeded by a dot release (eg. 2.19.1)
- an 'a' was appended to the version strings

So, this patch fixes the first issue by removing no-longer available versions (including patch dirs).

---
 package/binutils/Config.in.host                    |   16 --
 .../binutils/binutils-2.19/110-arm-eabi-conf.patch |   24 ---
 package/binutils/binutils-2.19/120-sh-conf.patch   |   42 -----
 .../binutils-2.19/300-001_ld_makefile_patch.patch  |   24 ---
 .../300-012_check_ldrunpath_length.patch           |   21 ---
 .../binutils/binutils-2.20/110-arm-eabi-conf.patch |   24 ---
 package/binutils/binutils-2.20/120-sh-conf.patch   |   42 -----
 .../binutils-2.20/300-001_ld_makefile_patch.patch  |   24 ---
 .../300-012_check_ldrunpath_length.patch           |   21 ---
 .../binutils-2.20/400-arm_link_speed.patch         |  183 --------------------
 .../binutils/binutils-2.21/110-arm-eabi-conf.patch |   24 ---
 package/binutils/binutils-2.21/120-sh-conf.patch   |   42 -----
 .../binutils-2.21/300-001_ld_makefile_patch.patch  |   24 ---
 .../300-012_check_ldrunpath_length.patch           |   21 ---
 14 files changed, 0 insertions(+), 532 deletions(-)
package/binutils/Config.in.host +0 -16
index f87298a..f035bfd 100644
@@ -17,28 +17,15 @@ choice
 	       depends on BR2_avr32
 	       bool "binutils 2.18-avr32-1.0.1"
 
-	config BR2_BINUTILS_VERSION_2_19
-		depends on !BR2_avr32
-		depends on BR2_DEPRECATED
-		bool "binutils 2.19"
-
 	config BR2_BINUTILS_VERSION_2_19_1
 		depends on !BR2_avr32
 		depends on BR2_DEPRECATED
 		bool "binutils 2.19.1"
 
-	config BR2_BINUTILS_VERSION_2_20
-		depends on !BR2_avr32
-		bool "binutils 2.20"
-
 	config BR2_BINUTILS_VERSION_2_20_1
 		depends on !BR2_avr32
 		bool "binutils 2.20.1"
 
-	config BR2_BINUTILS_VERSION_2_21
-		depends on !BR2_avr32
-		bool "binutils 2.21"
-
 	config BR2_BINUTILS_VERSION_2_21_1
 		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_30 || BR2_UCLIBC_VERSION_0_9_31)
 		bool "binutils 2.21.1"
@@ -49,11 +36,8 @@ config BR2_BINUTILS_VERSION
 	string
 	default "2.18"		if BR2_BINUTILS_VERSION_2_18
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
-	default "2.19"		if BR2_BINUTILS_VERSION_2_19
 	default "2.19.1"	if BR2_BINUTILS_VERSION_2_19_1
-	default "2.20"		if BR2_BINUTILS_VERSION_2_20
 	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
-	default "2.21"		if BR2_BINUTILS_VERSION_2_21
 	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
 
 config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
package/binutils/binutils-2.19/110-arm-eabi-conf.patch deleted +0 -24
deleted file mode 100644
index af26329..0000000
@@ -1,24 +0,0 @@
-diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure
---- binutils-2.18.50.0.3.orig/configure	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure	2007-11-22 12:45:01.000000000 +0100
-@@ -2245,7 +2245,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac
---- binutils-2.18.50.0.3.orig/configure.ac	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure.ac	2007-11-22 12:44:54.000000000 +0100
-@@ -522,7 +522,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
package/binutils/binutils-2.19/120-sh-conf.patch deleted +0 -42

42 lines not on this page · raw message

package/binutils/binutils-2.19/300-001_ld_makefile_patch.patch deleted +0 -24
deleted file mode 100644
index 5cb0f61..0000000
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
package/binutils/binutils-2.19/300-012_check_ldrunpath_length.patch deleted +0 -21
deleted file mode 100644
index 6e80921..0000000
@@ -1,21 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em
---- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200
-@@ -1007,6 +1007,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1191,6 +1193,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
package/binutils/binutils-2.20/110-arm-eabi-conf.patch deleted +0 -24
deleted file mode 100644
index af26329..0000000
@@ -1,24 +0,0 @@
-diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure
---- binutils-2.18.50.0.3.orig/configure	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure	2007-11-22 12:45:01.000000000 +0100
-@@ -2245,7 +2245,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac
---- binutils-2.18.50.0.3.orig/configure.ac	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure.ac	2007-11-22 12:44:54.000000000 +0100
-@@ -522,7 +522,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
package/binutils/binutils-2.20/120-sh-conf.patch deleted +0 -42

42 lines not on this page · raw message

package/binutils/binutils-2.20/300-001_ld_makefile_patch.patch deleted +0 -24
deleted file mode 100644
index 5cb0f61..0000000
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
package/binutils/binutils-2.20/300-012_check_ldrunpath_length.patch deleted +0 -21
deleted file mode 100644
index 6e80921..0000000
@@ -1,21 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em
---- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em	2007-06-18 19:31:40.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/emultempl/elf32.em	2007-06-25 10:01:25.000000000 +0200
-@@ -1007,6 +1007,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+		  lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1191,6 +1193,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+      rpath = NULL;
-   if (! (bfd_elf_size_dynamic_sections
- 	 (output_bfd, command_line.soname, rpath,
- 	  command_line.filter_shlib,
package/binutils/binutils-2.20/400-arm_link_speed.patch deleted +0 -183

183 lines not on this page · raw message

package/binutils/binutils-2.21/110-arm-eabi-conf.patch deleted +0 -24
deleted file mode 100644
index af26329..0000000
@@ -1,24 +0,0 @@
-diff -rdup binutils-2.18.50.0.3.orig/configure binutils-2.18.50.0.3/configure
---- binutils-2.18.50.0.3.orig/configure	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure	2007-11-22 12:45:01.000000000 +0100
-@@ -2245,7 +2245,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-diff -rdup binutils-2.18.50.0.3.orig/configure.ac binutils-2.18.50.0.3/configure.ac
---- binutils-2.18.50.0.3.orig/configure.ac	2007-11-22 12:41:26.000000000 +0100
-+++ binutils-2.18.50.0.3/configure.ac	2007-11-22 12:44:54.000000000 +0100
-@@ -522,7 +522,7 @@ case "${target}" in
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-*gnueabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
package/binutils/binutils-2.21/120-sh-conf.patch deleted +0 -42

42 lines not on this page · raw message

package/binutils/binutils-2.21/300-001_ld_makefile_patch.patch deleted +0 -24
deleted file mode 100644
index 5cb0f61..0000000
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
package/binutils/binutils-2.21/300-012_check_ldrunpath_length.patch deleted +0 -21
deleted file mode 100644
index df78310..0000000
@@ -1,21 +0,0 @@
-diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
---- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
-+++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
-@@ -1270,6 +1270,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1497,6 +1499,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
Signature · 1 line
1.7.2.5
#2 lore raw

PATCH 1/4 package/binutils: fixup version strings 1/2

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Yann> The binutils tarballs have been re-released after a GPL compliance Yann> issue was found:
Yann> http://sourceware.org/ml/binutils/2011-08/msg00198.html

Yann> So all versions were re-packaged.

Yann> In the process, two things happenned:
Yann> - some versions (eg. 2.19) went missing, due to them being super-seeded
Yann> by a dot release (eg. 2.19.1)
Yann> - an 'a' was appended to the version strings

Yann> So, this patch fixes the first issue by removing no-longer available Yann> versions (including patch dirs).

But mips/mipself/sh/uClibc 0.9.30 uses 2.21 as 2.21.1 doesn't work - So we'll need to fix that (use 2.19.1 instead?)

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/4 package/binutils: fixup version strings 2/2

In reply to Yann E. MORIN

The binutils tarballs have been re-released after a GPL compliance issue was found:
http://sourceware.org/ml/binutils/2011-08/msg00198.html

So all versions were re-packaged.

In the process, two things happenned:
- some versions (eg. 2.19) went missing, due to them being super-seeded by a dot release (eg. 2.19.1)
- an 'a' was appended to the version strings

So, this patch fixes the second issue by renaming version strings (including the patch dirs). It is to be noted that, although the versions got bumped to include an 'a' at the end, the directory contained in the tarball is still named after the version string without the 'a'. For example:

 - old version      : 2.19.1
 - new version      : 2.19.1a
 - tarball name     : binutils-2.19.1a.tar.bz2
 - directory name   : binutils-2.19.1/

In fact, it does not pose any problem for buildroot, as the extract process explicitly mkdirs the directory to extract into, *and* strips the first level of the tree extracted from the tarball.

---
 package/binutils/Config.in.host                    |   24 ++++++++++----------
 .../100-makeinfo-version.patch                     |    0
 .../110-arm-eabi-conf.patch                        |    0
 .../300-001_ld_makefile_patch.patch                |    0
 .../300-012_check_ldrunpath_length.patch           |    0
 .../110-arm-eabi-conf.patch                        |    0
 .../120-sh-conf.patch                              |    0
 .../300-001_ld_makefile_patch.patch                |    0
 .../300-012_check_ldrunpath_length.patch           |    0
 .../110-arm-eabi-conf.patch                        |    0
 .../120-sh-conf.patch                              |    0
 .../300-001_ld_makefile_patch.patch                |    0
 .../300-012_check_ldrunpath_length.patch           |    0
 .../400-arm_link_speed.patch                       |    0
 .../110-arm-eabi-conf.patch                        |    0
 .../120-sh-conf.patch                              |    0
 .../300-001_ld_makefile_patch.patch                |    0
 .../300-012_check_ldrunpath_length.patch           |    0
 18 files changed, 12 insertions(+), 12 deletions(-)
package/binutils/Config.in.host +12 -12
index f035bfd..ccd16f0 100644
@@ -8,37 +8,37 @@ choice
 	help
 	  Select the version of binutils you wish to use.
 
-	config BR2_BINUTILS_VERSION_2_18
+	config BR2_BINUTILS_VERSION_2_18a
 		depends on !BR2_avr32
 		depends on BR2_DEPRECATED
-		bool "binutils 2.18"
+		bool "binutils 2.18a"
 
 	config BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
 	       depends on BR2_avr32
 	       bool "binutils 2.18-avr32-1.0.1"
 
-	config BR2_BINUTILS_VERSION_2_19_1
+	config BR2_BINUTILS_VERSION_2_19_1a
 		depends on !BR2_avr32
 		depends on BR2_DEPRECATED
-		bool "binutils 2.19.1"
+		bool "binutils 2.19.1a"
 
-	config BR2_BINUTILS_VERSION_2_20_1
+	config BR2_BINUTILS_VERSION_2_20_1a
 		depends on !BR2_avr32
-		bool "binutils 2.20.1"
+		bool "binutils 2.20.1a"
 
-	config BR2_BINUTILS_VERSION_2_21_1
+	config BR2_BINUTILS_VERSION_2_21_1a
 		depends on !(BR2_avr32 || BR2_UCLIBC_VERSION_0_9_30 || BR2_UCLIBC_VERSION_0_9_31)
-		bool "binutils 2.21.1"
+		bool "binutils 2.21.1a"
 
 endchoice
 
 config BR2_BINUTILS_VERSION
 	string
-	default "2.18"		if BR2_BINUTILS_VERSION_2_18
+	default "2.18a"		if BR2_BINUTILS_VERSION_2_18a
 	default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1
-	default "2.19.1"	if BR2_BINUTILS_VERSION_2_19_1
-	default "2.20.1"	if BR2_BINUTILS_VERSION_2_20_1
-	default "2.21.1"	if BR2_BINUTILS_VERSION_2_21_1
+	default "2.19.1a"	if BR2_BINUTILS_VERSION_2_19_1a
+	default "2.20.1a"	if BR2_BINUTILS_VERSION_2_20_1a
+	default "2.21.1a"	if BR2_BINUTILS_VERSION_2_21_1a
 
 config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS
 	string "Additional binutils options"
package/binutils/binutils-2.18a/100-makeinfo-version.patch renamed from package/binutils/binutils-2.18/100-makeinfo-version.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.18/100-makeinfo-version.patch
rename to package/binutils/binutils-2.18a/100-makeinfo-version.patch
package/binutils/binutils-2.18a/110-arm-eabi-conf.patch renamed from package/binutils/binutils-2.18/110-arm-eabi-conf.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.18/110-arm-eabi-conf.patch
rename to package/binutils/binutils-2.18a/110-arm-eabi-conf.patch
package/binutils/binutils-2.18a/300-001_ld_makefile_patch.patch renamed from package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch
rename to package/binutils/binutils-2.18a/300-001_ld_makefile_patch.patch
package/binutils/binutils-2.18a/300-012_check_ldrunpath_length.patch renamed from package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch
rename to package/binutils/binutils-2.18a/300-012_check_ldrunpath_length.patch
package/binutils/binutils-2.19.1a/110-arm-eabi-conf.patch renamed from package/binutils/binutils-2.19.1/110-arm-eabi-conf.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.19.1/110-arm-eabi-conf.patch
rename to package/binutils/binutils-2.19.1a/110-arm-eabi-conf.patch
package/binutils/binutils-2.19.1a/120-sh-conf.patch renamed from package/binutils/binutils-2.19.1/120-sh-conf.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.19.1/120-sh-conf.patch
rename to package/binutils/binutils-2.19.1a/120-sh-conf.patch
package/binutils/binutils-2.19.1a/300-001_ld_makefile_patch.patch renamed from package/binutils/binutils-2.19.1/300-001_ld_makefile_patch.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.19.1/300-001_ld_makefile_patch.patch
rename to package/binutils/binutils-2.19.1a/300-001_ld_makefile_patch.patch
package/binutils/binutils-2.19.1a/300-012_check_ldrunpath_length.patch renamed from package/binutils/binutils-2.19.1/300-012_check_ldrunpath_length.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.19.1/300-012_check_ldrunpath_length.patch
rename to package/binutils/binutils-2.19.1a/300-012_check_ldrunpath_length.patch
package/binutils/binutils-2.20.1a/110-arm-eabi-conf.patch renamed from package/binutils/binutils-2.20.1/110-arm-eabi-conf.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.20.1/110-arm-eabi-conf.patch
rename to package/binutils/binutils-2.20.1a/110-arm-eabi-conf.patch
package/binutils/binutils-2.20.1a/120-sh-conf.patch renamed from package/binutils/binutils-2.20.1/120-sh-conf.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.20.1/120-sh-conf.patch
rename to package/binutils/binutils-2.20.1a/120-sh-conf.patch
package/binutils/binutils-2.20.1a/300-001_ld_makefile_patch.patch renamed from package/binutils/binutils-2.20.1/300-001_ld_makefile_patch.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.20.1/300-001_ld_makefile_patch.patch
rename to package/binutils/binutils-2.20.1a/300-001_ld_makefile_patch.patch
package/binutils/binutils-2.20.1a/300-012_check_ldrunpath_length.patch renamed from package/binutils/binutils-2.20.1/300-012_check_ldrunpath_length.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.20.1/300-012_check_ldrunpath_length.patch
rename to package/binutils/binutils-2.20.1a/300-012_check_ldrunpath_length.patch
package/binutils/binutils-2.20.1a/400-arm_link_speed.patch renamed from package/binutils/binutils-2.20.1/400-arm_link_speed.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.20.1/400-arm_link_speed.patch
rename to package/binutils/binutils-2.20.1a/400-arm_link_speed.patch
package/binutils/binutils-2.21.1a/110-arm-eabi-conf.patch renamed from package/binutils/binutils-2.21.1/110-arm-eabi-conf.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.21.1/110-arm-eabi-conf.patch
rename to package/binutils/binutils-2.21.1a/110-arm-eabi-conf.patch
package/binutils/binutils-2.21.1a/120-sh-conf.patch renamed from package/binutils/binutils-2.21.1/120-sh-conf.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.21.1/120-sh-conf.patch
rename to package/binutils/binutils-2.21.1a/120-sh-conf.patch
package/binutils/binutils-2.21.1a/300-001_ld_makefile_patch.patch renamed from package/binutils/binutils-2.21.1/300-001_ld_makefile_patch.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.21.1/300-001_ld_makefile_patch.patch
rename to package/binutils/binutils-2.21.1a/300-001_ld_makefile_patch.patch
package/binutils/binutils-2.21.1a/300-012_check_ldrunpath_length.patch renamed from package/binutils/binutils-2.21.1/300-012_check_ldrunpath_length.patch +0 -0
similarity index 100%
rename from package/binutils/binutils-2.21.1/300-012_check_ldrunpath_length.patch
rename to package/binutils/binutils-2.21.1a/300-012_check_ldrunpath_length.patch
Signature · 1 line
1.7.2.5
#4 lore raw

PATCH 3/4 toolchain/gdb: strip tarball component when extracting

In reply to Yann E. MORIN

For some tarballs of gdb (see next patch), the extracted directory is *not* named after the version string (eg. gdb-6.6a extract into gdb-6.6/)

Create the appropriate directory first, then use --strip-{components,path} when extracting gdb (the same way it is done for the generic package infrastructure).

At the same time, get rid of the snapshot special case, because:
1- it's no longer available in the menu
2- it would be handled by the above change

---
 toolchain/gdb/gdb.mk |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
toolchain/gdb/gdb.mk +2 -7
index caf3e36..190c01b 100644
@@ -28,13 +28,8 @@ $(DL_DIR)/$(GDB_SOURCE):
 
 gdb-unpacked: $(GDB_DIR)/.unpacked
 $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
-	mkdir -p $(TOOLCHAIN_DIR)
-	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
-ifeq ($(GDB_VERSION),snapshot)
-	GDB_REAL_DIR=$(shell \
-		tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1)
-	ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
-endif
+	mkdir -p $(GDB_DIR)
+	$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
 ifneq ($(wildcard $(GDB_PATCH_DIR)),)
 	toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
 endif
Signature · 1 line
1.7.2.5
#5 lore raw

PATCH 4/4 toolchain/gdb: fixup version strings

In reply to Yann E. MORIN

The binutils tarballs have been re-released after a GPL compliance issue was found:
http://sourceware.org/ml/binutils/2011-08/msg00198.html

So all versions were re-packaged.

In the process, an 'a' was appended to the version strings.

So, this patch fixes the issue by renaming version strings. It is to be noted that, although the versions got bumped to include an 'a' at the end, the directory contained in the tarball is still named after the version string without the 'a'. For example:

 - old version      : 6.6
 - new version      : 6.6a
 - tarball name     : gdb-6.6a.tar.bz2
 - directory name   : gdb-6.6/

In fact, it does not pose any problem for buildroot, as the extract process explicitly mkdirs the directory to extract into, *and* strips the first level of the tree extracted from the tarball.

---
 toolchain/gdb/{6.6 => 6.6a}/100-uclibc-conf.patch  |    0
 .../600-fix-compile-flag-mismatch.patch            |    0
 .../gdb/{6.6 => 6.6a}/gdb-6.6-bfin-gdbserver.patch |    0
 .../600-fix-compile-flag-mismatch.patch            |    0
 .../600-fix-compile-flag-mismatch.patch            |    0
 toolchain/gdb/Config.in                            |   30 ++++++++++----------
 6 files changed, 15 insertions(+), 15 deletions(-)
toolchain/gdb/6.6a/100-uclibc-conf.patch renamed from toolchain/gdb/6.6/100-uclibc-conf.patch +0 -0
similarity index 100%
rename from toolchain/gdb/6.6/100-uclibc-conf.patch
rename to toolchain/gdb/6.6a/100-uclibc-conf.patch
toolchain/gdb/6.6a/600-fix-compile-flag-mismatch.patch renamed from toolchain/gdb/6.6/600-fix-compile-flag-mismatch.patch +0 -0
similarity index 100%
rename from toolchain/gdb/6.6/600-fix-compile-flag-mismatch.patch
rename to toolchain/gdb/6.6a/600-fix-compile-flag-mismatch.patch
toolchain/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch renamed from toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch +0 -0
similarity index 100%
rename from toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch
rename to toolchain/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch
toolchain/gdb/6.7.1a/600-fix-compile-flag-mismatch.patch renamed from toolchain/gdb/6.7.1/600-fix-compile-flag-mismatch.patch +0 -0
similarity index 100%
rename from toolchain/gdb/6.7.1/600-fix-compile-flag-mismatch.patch
rename to toolchain/gdb/6.7.1a/600-fix-compile-flag-mismatch.patch
toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch renamed from toolchain/gdb/6.8/600-fix-compile-flag-mismatch.patch +0 -0
similarity index 100%
rename from toolchain/gdb/6.8/600-fix-compile-flag-mismatch.patch
rename to toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch
toolchain/gdb/Config.in +15 -15
index 8295f79..23e9624 100644
@@ -32,30 +32,30 @@ choice
 	help
 	  Select the version of gdb you wish to use.
 
-	config BR2_GDB_VERSION_6_6
-		bool "gdb 6.6"
+	config BR2_GDB_VERSION_6_6a
+		bool "gdb 6.6a"
 		depends on !BR2_avr32
 		depends on BR2_DEPRECATED || BR2_bfin
 
-	config BR2_GDB_VERSION_6_7_1
+	config BR2_GDB_VERSION_6_7_1a
 		depends on !(BR2_avr32 || BR2_bfin)
-		bool "gdb 6.7.1"
+		bool "gdb 6.7.1a"
 
 	config BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
 		depends on BR2_avr32
 		bool "gdb 6.7.1-avr32-2.1.5"
 
-	config BR2_GDB_VERSION_6_8
-		bool "gdb 6.8"
+	config BR2_GDB_VERSION_6_8a
+		bool "gdb 6.8a"
 		depends on !(BR2_avr32 || BR2_bfin)
 
-	config BR2_GDB_VERSION_7_0_1
-		bool "gdb 7.0.1"
+	config BR2_GDB_VERSION_7_0_1a
+		bool "gdb 7.0.1a"
 		depends on !BR2_bfin
 		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
 
-	config BR2_GDB_VERSION_7_1
-		bool "gdb 7.1"
+	config BR2_GDB_VERSION_7_1a
+		bool "gdb 7.1a"
 		depends on !BR2_bfin
 		select BR2_PTHREAD_DEBUG if !BR2_PTHREADS_NONE
 
@@ -63,9 +63,9 @@ endchoice
 
 config BR2_GDB_VERSION
 	string
-	default "6.6"      if BR2_GDB_VERSION_6_6
-	default "6.7.1"    if BR2_GDB_VERSION_6_7_1
+	default "6.6a"     if BR2_GDB_VERSION_6_6a
+	default "6.7.1a"   if BR2_GDB_VERSION_6_7_1a
 	default "6.7.1-avr32-2.1.5" if BR2_GDB_VERSION_6_7_1_AVR32_2_1_5
-	default "6.8"      if BR2_GDB_VERSION_6_8
-	default "7.0.1"    if BR2_GDB_VERSION_7_0_1
-	default "7.1"      if BR2_GDB_VERSION_7_1
+	default "6.8a"     if BR2_GDB_VERSION_6_8a
+	default "7.0.1a"   if BR2_GDB_VERSION_7_0_1a
+	default "7.1a"     if BR2_GDB_VERSION_7_1a
Signature · 1 line
1.7.2.5