update zipme tool; remove unused directories

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1730 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 55 insertions, 101 deletions

diff --git a/misc/buildroot/toolchain/binutils/binutils.mk b/misc/buildroot/toolchain/binutils/binutils.mk
index 2c4f01531..49ae481ae 100644
--- a/misc/buildroot/toolchain/binutils/binutils.mk
+++ b/misc/buildroot/toolchain/binutils/binutils.mk
@@ -9,30 +9,15 @@ BINUTILS_VERSION:=$(strip $(subst ",, $(BR2_BINUTILS_VERSION)))
 EXTRA_BINUTILS_CONFIG_OPTIONS=$(strip $(subst ",, $(BR2_EXTRA_BINUTILS_CONFIG_OPTIONS)))
 #"))
 BINUTILS_SITE:=ftp://ftp.kernel.org/pub/linux/devel/binutils
-ifeq ($(BINUTILS_VERSION),2.19)
-BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-endif
-ifeq ($(BINUTILS_VERSION),2.17)
+ifeq ($(BINUTILS_VERSION),2.19.1)
 BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
 endif
-ifeq ($(BINUTILS_VERSION),2.16)
-BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-endif
-ifeq ($(BINUTILS_VERSION),2.16.1)
-BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-endif
-ifeq ($(BINUTILS_VERSION),2.15)
-BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
-endif
-ifeq ($(BINUTILS_VERSION),2.14)
+ifeq ($(BINUTILS_VERSION),2.19)
 BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
 endif
-ifeq ($(BINUTILS_VERSION),2.13)
+ifeq ($(BINUTILS_VERSION),2.17)
 BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
 endif
-ifeq ($(BINUTILS_VERSION),2.15.97)
-BINUTILS_SITE:=ftp://sources.redhat.com/pub/binutils/snapshots/
-endif
 
 # NOTE: Unlike the original buildroot binutils.mk, this version always relies on
 # the system libgmp and libmpfr which must be installed for certain binutils versions.
diff --git a/misc/buildroot/toolchain/gdb/Config.in b/misc/buildroot/toolchain/gdb/Config.in
index 7465542b6..22b9832e3 100644
--- a/misc/buildroot/toolchain/gdb/Config.in
+++ b/misc/buildroot/toolchain/gdb/Config.in
@@ -27,40 +27,18 @@ choice
 	help
 	  Select the version of gdb you wish to use.
 
-	config BR2_GDB_VERSION_6_2_1
-		bool "gdb 6.2.1"
-		depends on !BR2_avr32 && !BR2_nios2
-		depends on BR2_DEPRECATED
-
 	config BR2_GDB_VERSION_6_3
 		bool "gdb 6.3"
 		depends on !BR2_avr32 && !BR2_nios2
 		depends on BR2_DEPRECATED
 
-	config BR2_GDB_VERSION_6_4
-		bool "gdb 6.4"
-		depends on !BR2_avr32 && !BR2_nios2
-		depends on BR2_DEPRECATED
-
-	config BR2_GDB_VERSION_6_5
-		bool "gdb 6.5"
-		depends on !BR2_avr32 && !BR2_nios2
-
 	config BR2_GDB_VERSION_6_8
 		bool "gdb 6.8"
 		depends on !BR2_avr32
 
-	config BR2_GDB_VERSION_SNAPSHOT
-		bool "gdb snapshot"
-		depends on !BR2_avr32 && !BR2_nios2
-
 endchoice
 
 config BR2_GDB_VERSION
 	string
-	default "6.2.1"    if BR2_GDB_VERSION_6_2_1
 	default "6.3"      if BR2_GDB_VERSION_6_3
-	default "6.4"      if BR2_GDB_VERSION_6_4
-	default "6.5"      if BR2_GDB_VERSION_6_5
 	default "6.8"      if BR2_GDB_VERSION_6_8
-	default "snapshot" if BR2_GDB_VERSION_SNAPSHOT
diff --git a/misc/buildroot/toolchain/gdb/Config.in.2 b/misc/buildroot/toolchain/gdb/Config.in.2
deleted file mode 100644
index 430355176..000000000
--- a/misc/buildroot/toolchain/gdb/Config.in.2
+++ /dev/null
@@ -1,54 +0,0 @@
-# Keep this in sync with Config.in
-
-comment "Gdb Options"
-
-config BR2_PACKAGE_GDB
-	bool "Build gdb debugger for the Target"
-	default n
-	help
-	    Build the full gdb debugger to run on the target.
-
-config BR2_PACKAGE_GDB_SERVER
-	bool "Build gdb server for the Target"
-	default n
-	help
-	    Build the gdbserver stub to run on the target.
-	    A full gdb is needed to debug the progam.
-
-config BR2_PACKAGE_GDB_HOST
-	bool "Build gdb for the Host"
-	default n
-	help
-	    Build gdb to run on the host to debug programs run on the target.
-
-choice
-	prompt "GDB debugger Version"
-	default BR2_GDB_VERSION_6_3
-	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_GDB_SERVER || BR2_PACKAGE_GDB_HOST
-	help
-	  Select the version of gdb you wish to use.
-
-	config BR2_EXT_GDB_VERSION_6_2_1
-		bool "gdb 6.2.1"
-
-	config BR2_EXT_GDB_VERSION_6_3
-		bool "gdb 6.3"
-
-	config BR2_EXT_GDB_VERSION_6_4
-		bool "gdb 6.4"
-
-	config BR2_EXT_GDB_VERSION_6_5
-		bool "gdb 6.5"
-
-	config BR2_EXT_GDB_VERSION_SNAPSHOT
-		bool "gdb snapshot"
-
-endchoice
-
-config BR2_EXT_GDB_VERSION
-	string
-	default "6.2.1"    if BR2_EXT_GDB_VERSION_6_2_1
-	default "6.3"      if BR2_EXT_GDB_VERSION_6_3
-	default "6.4"      if BR2_EXT_GDB_VERSION_6_4
-	default "6.5"      if BR2_EXT_GDB_VERSION_6_5
-	default "snapshot" if BR2_EXT_GDB_VERSION_SNAPSHOT
diff --git a/misc/buildroot/toolchain/gdb/gdb.mk b/misc/buildroot/toolchain/gdb/gdb.mk
index 853ce51b2..5a7c9acf2 100644
--- a/misc/buildroot/toolchain/gdb/gdb.mk
+++ b/misc/buildroot/toolchain/gdb/gdb.mk
@@ -19,9 +19,6 @@ GDB_CAT:=$(BZCAT)
 GDB_DIR:=$(TOOL_BUILD_DIR)/gdb-$(GDB_VERSION)
 
 # NOTE: This option should not be used with gdb versions 6.4 and above.
-ifeq ($(GDB_VERSION),6.2.1)
-DISABLE_GDBMI:=--disable-gdbmi
-endif
 
 ifeq ($(GDB_VERSION),6.3)
 DISABLE_GDBMI:=--disable-gdbmi
diff --git a/misc/buildroot/zipme.sh b/misc/buildroot/zipme.sh
index 5a0ae50d5..cd5be4cd5 100755
--- a/misc/buildroot/zipme.sh
+++ b/misc/buildroot/zipme.sh
@@ -18,21 +18,22 @@ fi
 # see the directory to tar up
 
 MYNAME=`basename $0`
+BRNAME=buildroot-${VERSION}
 
 if [ -x ${WD}/${MYNAME} ] ; then
    MISCDIR=`dirname ${WD}`
 else
-   if [ -x ${WD}/buildroot/${MYNAME} ] ; then
+   if [ -x ${WD}/${BRNAME}/${MYNAME} ] ; then
      MISCDIR=${WD}
    else
-     echo "You must cd into the misc/ or misc/buildroot/ directory to execute this script."
+     echo "You must cd into the misc/ or misc/${BRNAME}/ directory to execute this script."
      exit 1
    fi
 fi
 
 # Get the path to the parent directory
 
-SUBDIR=`basename ${MISCDIR}`/buildroot
+SUBDIR=`basename ${MISCDIR}`/${BRNAME}
 PARENT=`dirname ${MISCDIR}`
 
 # The name of the directory must match the version number
@@ -45,7 +46,7 @@ if [ ! -d ${SUBDIR} ] ; then
    exit 1
 fi
 
-TAR_NAME=buildroot-${VERSION}.tar
+TAR_NAME=${BRNAME}.tar
 ZIP_NAME=${TAR_NAME}.gz
 
 # Prepare the buildroot directory -- Remove editor garbage
@@ -55,6 +56,53 @@ find ${SUBDIR} -name '*~' -exec rm -f '{}' ';' || \
 find ${SUBDIR} -name '*.swp' -exec rm -f '{}' ';' || \
       { echo "Removal of VI garbage failed!" ; exit 1 ; }
 
+# Remove garbage directories that creap into CVS because the
+# are obsoleted or bad imports
+
+oldlist="\
+  toolchain/binutils/2.14.90.0.8\
+  toolchain/binutils/2.15\
+  toolchain/binutils/2.15.94.0.2.2\
+  toolchain/binutils/2.16.1\
+  toolchain/binutils/2.16.90.0.3\
+  toolchain/binutils/2.16.91.0.5\
+  toolchain/binutils/2.16.91.0.6\
+  toolchain/binutils/2.16.91.0.7\
+  toolchain/binutils/2.17.50.0.10\
+  toolchain/binutils/2.17.50.0.2\
+  toolchain/binutils/2.17.50.0.3\
+  toolchain/binutils/2.17.50.0.4\
+  toolchain/binutils/2.17.50.0.5\
+  toolchain/binutils/2.17.50.0.6\
+  toolchain/binutils/2.17.50.0.7\
+  toolchain/binutils/2.17.50.0.8\
+  toolchain/binutils/2.17.50.0.9\
+  toolchain/binutils/2.19.1/.svn\
+  toolchain/gcc/3.3.5\
+  toolchain/gcc/3.3.6\
+  toolchain/gcc/3.4.2\
+  toolchain/gcc/3.4.3\
+  toolchain/gcc/3.4.4\
+  toolchain/gcc/3.4.5\
+  toolchain/gcc/4.0.0\
+  toolchain/gcc/4.0.1\
+  toolchain/gcc/4.0.2\
+  toolchain/gcc/4.0.3\
+  toolchain/gcc/4.0.4\
+  toolchain/gcc/4.1.0\
+  toolchain/gcc/4.1.1\
+  toolchain/gcc/4.1.2\
+  toolchain/gcc/4.2\
+  toolchain/gdb/6.2.1\
+  toolchain/gdb/6.4\
+  toolchain/gdb/6.5\
+"
+
+for dir in $oldlist; do
+	echo "Removing ${SUBDIR}/$dir"
+	rm -rf ${SUBDIR}/$dir
+done
+
 # Remove any previous tarballs
 
 if [ -f ${TAR_NAME} ] ; then