fixup version strings after GPL compliance issue in gdb, v2
cover fixup version strings after GPL compliance issue in gdb, v2
Hello All,
Recently, a GPL compliance issue was found in binutils and gdb (and emacs, but who cares? ;-)). More info is available in each patch's commit message.
This patchset addresses the gdb issue; binutils will come later when we get to solve the existing issues.
Changes since v1:
- fix-up commit messages (Peter)
[PATCH 1/2] toolchain/gdb: strip tarball component when extracting [PATCH 2/2] toolchain/gdb: fixup version strings
Regards,
Yann E. MORIN.
PATCH 1/2 toolchain/gdb: strip tarball component when extracting
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
@@ -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
PATCH 1/2 toolchain/gdb: strip tarball component when extracting
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> For some tarballs of gdb (see next patch), the extracted directory is Yann> *not* named after the version string (eg. gdb-6.6a extract into gdb-6.6/)
Yann> Create the appropriate directory first, then use --strip-{components,path} Yann> when extracting gdb (the same way it is done for the generic package Yann> infrastructure).
Yann> At the same time, get rid of the snapshot special case, because:
Yann> 1- it's no longer available in the menu
Yann> 2- it would be handled by the above change
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 toolchain/gdb: fixup version strings
In reply to Yann E. MORINThe gdb tarballs have been re-released after a GPL compliance issue was found:
http://sourceware.org/ml/gdb/2011-09/msg00030.html
So all versions were re-packaged.
In the process, an 'a' was appended to the version strings, and unlike the binutils people, the gdb folks are not inclined in providing legacy symlinks:
http://sourceware.org/ml/gdb/2011-09/msg00036.html
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
toolchain/gdb/6.6a/600-fix-compile-flag-mismatch.patch renamed from toolchain/gdb/6.6/600-fix-compile-flag-mismatch.patch +0 -0
toolchain/gdb/6.6a/gdb-6.6-bfin-gdbserver.patch renamed from toolchain/gdb/6.6/gdb-6.6-bfin-gdbserver.patch +0 -0
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
toolchain/gdb/6.8a/600-fix-compile-flag-mismatch.patch renamed from toolchain/gdb/6.8/600-fix-compile-flag-mismatch.patch +0 -0
toolchain/gdb/Config.in +15 -15
@@ -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
PATCH 2/2 toolchain/gdb: fixup version strings
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Yann> The gdb tarballs have been re-released after a GPL compliance Yann> issue was found:
Yann> http://sourceware.org/ml/gdb/2011-09/msg00030.html
Yann> So all versions were re-packaged.
Yann> In the process, an 'a' was appended to the version strings, and Yann> unlike the binutils people, the gdb folks are not inclined in Yann> providing legacy symlinks:
Yann> http://sourceware.org/ml/gdb/2011-09/msg00036.html
Yann> So, this patch fixes the issue by renaming version strings. It is to be Yann> noted that, although the versions got bumped to include an 'a' at the end, Yann> the directory contained in the tarball is still named after the version Yann> string without the 'a'. For example:
Yann> - old version : 6.6 Yann> - new version : 6.6a Yann> - tarball name : gdb-6.6a.tar.bz2 Yann> - directory name : gdb-6.6/
Yann> In fact, it does not pose any problem for buildroot, as the extract process Yann> explicitly mkdirs the directory to extract into, *and* strips the first level Yann> of the tree extracted from the tarball.
Committed with minor changes to apply to head + I prefer to not change the config symbols, only the tarball versions.
Signature · 1 line
Bye, Peter Korsgaard