Toolchain: use GDB as addon

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

6 files changed, 10 insertions, 22 deletions

diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 10d346d..597291f 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -40,7 +40,7 @@ HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_ROOTFS_HAVE_SQUASHFS) += squashfs_tools_inst
 
 # Files to strip if requested
 ifeq ($(CONFIG_EMBTK_TARGET_STRIPPED),y)
-ROOTFS_STRIPPED_FILES := `find $$ROOTFS/lib -type f -name *.so*`
+ROOTFS_STRIPPED_FILES = `find $$ROOTFS/lib -type f -name *.so*`
 ROOTFS_STRIPPED_FILES += `find $$ROOTFS/usr/lib -type f -name *.so*`
 ifeq ($(CONFIG_EMBTK_64BITS_FS_COMPAT32),y)
 ROOTFS_STRIPPED_FILES += `find $$ROOTFS/lib32 -type f -name *.so*`
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 14d35ef..b9f8543 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -78,6 +78,12 @@ include $(EMBTK_ROOT)/mk/linux.mk
 include $(EMBTK_ROOT)/mk/strace.mk
 TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_STRACE) += strace_install
 
+# gdb toolchain addon
+include $(EMBTK_ROOT)/packages/development/gdb/gdb.mk
+TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDB) += gdbfull_install
+TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install
+TOOLCHAIN_ADDONS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install
+
 #Autotools
 include $(EMBTK_ROOT)/mk/libtool.mk
 include $(EMBTK_ROOT)/mk/autoconf.mk
diff --git a/packages/development/development.kconfig b/packages/development/development.kconfig
index cab2c9d..35ea937 100644
--- a/packages/development/development.kconfig
+++ b/packages/development/development.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,8 +23,6 @@
 # \date         October 2010
 ################################################################################
 
-# GDB: already included from main kconfig
-
 #libevent
 source packages/development/libevent/libevent.kconfig
 
diff --git a/packages/development/development.mk b/packages/development/development.mk
index eed1829..97025fa 100644
--- a/packages/development/development.mk
+++ b/packages/development/development.mk
@@ -23,12 +23,6 @@
 # \date         February 2010
 ################################################################################
 
-# gdb
-include $(EMBTK_ROOT)/packages/development/gdb/gdb.mk
-ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_GDB) += gdbfull_install
-ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_GDBSERVER) += gdbserver_install
-HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_GDB) += gdb_host_install
-
 #libevent
 include $(EMBTK_ROOT)/packages/development/libevent/libevent.mk
 ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_LIBEVENT) += libevent_install
diff --git a/packages/development/gdb/gdb.kconfig b/packages/development/gdb/gdb.kconfig
index 9fa6135..f0eb60c 100644
--- a/packages/development/gdb/gdb.kconfig
+++ b/packages/development/gdb/gdb.kconfig
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -46,7 +46,6 @@ endchoice
 
 choice
 	prompt "GDB on your target embedded system"
-	depends on EMBTK_HAVE_ROOTFS
 	depends on EMBTK_HAVE_GDB_SYSTEM
 	config EMBTK_HAVE_GDBSERVER
 		bool "Have gdbserver on target"
@@ -89,16 +88,8 @@ config EMBTK_GDB_NEED_PATCH
 config EMBTK_GDB_NEED_AUTORECONF
 	bool
 	select EMBTK_GDB_HOST_NEED_AUTORECONF
-config EMBTK_GDB_PKG_IS_TARGZ
-	bool
-config EMBTK_GDB_PKG_IS_TARBZ2
-	bool
 
 config EMBTK_GDB_HOST_NEED_PATCH
 	bool
 config EMBTK_GDB_HOST_NEED_AUTORECONF
 	bool
-config EMBTK_GDB_HOST_PKG_IS_TARGZ
-	bool
-config EMBTK_GDB_HOST_PKG_IS_TARBZ2
-	bool
diff --git a/packages/development/gdb/gdb.mk b/packages/development/gdb/gdb.mk
index 75ed51c..217903f 100644
--- a/packages/development/gdb/gdb.mk
+++ b/packages/development/gdb/gdb.mk
@@ -1,6 +1,6 @@
 ################################################################################
 # Embtoolkit
-# Copyright(C) 2009-2011 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2009-2012 Abdoulaye Walsimou GAYE.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 GDB_NAME		:= gdb
 GDB_VERSION		:= $(call embtk_get_pkgversion,gdb)
 GDB_SITE		:= http://ftp.gnu.org/gnu/gdb
-GDB_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 GDB_PACKAGE		:= gdb-$(GDB_VERSION).tar.bz2
 GDB_SRC_DIR		:= $(PACKAGES_BUILD)/gdb-$(GDB_VERSION)
 GDB_BUILD_DIR		:= $(if $(CONFIG_EMBTK_HAVE_GDBSERVER),		\