move tools from toolchain/ to tools/

SVN-Revision: 4866

31 files changed, 94 insertions, 29 deletions

diff --git a/openwrt/Makefile b/openwrt/Makefile
index 88d4ae5..c2538c2 100644
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -85,6 +85,9 @@ package/%: .pkginfo FORCE
 target/%: .pkginfo FORCE
 	$(MAKE) -C target $(patsubst target/%,%,$@)
 
+tools/%: FORCE
+	$(MAKE) -C tools $(patsubst tools/%,%,$@)
+
 toolchain/%: FORCE
 	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
@@ -108,11 +111,13 @@ toolchain/%: FORCE
 prereq: .prereq-build .prereq-packages FORCE
 
 download: .config FORCE
+	$(MAKE) tools/download
 	$(MAKE) toolchain/download
 	$(MAKE) package/download
 	$(MAKE) target/download
 
 world: .config FORCE
+	$(MAKE) tools/install
 	$(MAKE) toolchain/install
 	$(MAKE) target/compile
 	$(MAKE) package/compile
@@ -124,7 +129,7 @@ clean: FORCE
 	rm -rf build_* bin
 
 dirclean: clean
-	rm -rf staging_dir_* toolchain_build_*
+	rm -rf staging_dir_* toolchain_build_* tool_build
 
 distclean: dirclean config-clean
 	rm -rf dl .*config* .pkg* .prereq
diff --git a/openwrt/rules.mk b/openwrt/rules.mk
index 768b480..f0d21a2 100644
--- a/openwrt/rules.mk
+++ b/openwrt/rules.mk
@@ -22,7 +22,8 @@ OPTIMIZE_FOR_CPU:=$(ARCH)
 DL_DIR:=$(TOPDIR)/dl
 INCLUDE_DIR:=$(TOPDIR)/include
 SCRIPT_DIR:=$(TOPDIR)/scripts
-TOOL_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)
+TOOL_BUILD_DIR:=$(TOPDIR)/tool_build
+TOOLCHAIN_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)
 STAGING_DIR:=$(TOPDIR)/staging_dir_$(ARCH)
 BIN_DIR:=$(TOPDIR)/bin
 PACKAGE_DIR:=$(BIN_DIR)/packages
@@ -47,7 +48,7 @@ TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 export PATH:=$(TARGET_PATH)
 
 LINUX_DIR:=$(BUILD_DIR)/linux
-LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
+LINUX_HEADERS_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux
 
 # APPLICATIONS #
 HOSTCC:=gcc
diff --git a/openwrt/toolchain/Makefile b/openwrt/toolchain/Makefile
index 0b8b628..d324325 100644
--- a/openwrt/toolchain/Makefile
+++ b/openwrt/toolchain/Makefile
@@ -7,13 +7,12 @@
 # Main makefile for the toolchain
 #
 include $(TOPDIR)/rules.mk
-TARGETS-y:=sed kernel-headers sstrip
+
+TARGETS-y:=kernel-headers libnotimpl
+TARGETS-$(CONFIG_GDB) += gdb
 ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
   TARGETS-y+=binutils gcc uClibc
 endif
-TARGETS-y+=ipkg-utils libnotimpl ext2fs squashfs jffs2 lzma mkimage
-
-TARGETS-$(CONFIG_GDB) += gdb
 
 TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
@@ -24,15 +23,14 @@ download: $(TARGETS_DOWNLOAD)
 install: $(TARGETS_INSTALL)
 clean: $(TARGETS_CLEAN)
 
-kernel-headers-prepare: sed-install
-uClibc-prepare: kernel-headers-prepare sstrip-install
+uClibc-prepare: kernel-headers-prepare
 ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
   binutils-prepare: uClibc-prepare
   gcc-prepare: binutils-install
   uClibc-compile: gcc-compile
+  libnotimpl-compile: gcc-install
 endif
 gcc-install: uClibc-install
-squashfs-compile: lzma-install
 
 TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles
 
@@ -45,13 +43,13 @@ $(STAGING_DIR):
 	@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
 	@ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
 
-$(TOOL_BUILD_DIR):
+$(TOOLCHAIN_BUILD_DIR):
 	@mkdir -p $@
 
 %-download: FORCE
 	$(MAKE) -C $(patsubst %-download,%,$@) download
 
-%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
+%-prepare: $(TOOLCHAIN_STAMP_DIR) $(STAGING_DIR) $(TOOLCHAIN_BUILD_DIR) FORCE
 	@[ -f $(TOOLCHAIN_STAMP_DIR)/.toolchain_$@ ] || { \
 		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
 	}
diff --git a/openwrt/toolchain/binutils/Makefile b/openwrt/toolchain/binutils/Makefile
index 4d7a22a..e36758f 100644
--- a/openwrt/toolchain/binutils/Makefile
+++ b/openwrt/toolchain/binutils/Makefile
@@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/binutils/ \
 
 PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2
 PKG_MD5SUM:=unknown
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/host-build.mk
diff --git a/openwrt/toolchain/gcc/Makefile b/openwrt/toolchain/gcc/Makefile
index 77f7645..8a23375 100644
--- a/openwrt/toolchain/gcc/Makefile
+++ b/openwrt/toolchain/gcc/Makefile
@@ -30,7 +30,7 @@ PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VER
 	ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION)
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)
 
 TARGET_LANGUAGES:=c
 ifeq ($(CONFIG_INSTALL_LIBSTDCPP),y)
@@ -42,8 +42,8 @@ endif
 
 include $(INCLUDE_DIR)/host-build.mk
 
-BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
-BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-final
+BUILD_DIR1:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
+BUILD_DIR2:=$(TOOLCHAIN_BUILD_DIR)/gcc-$(PKG_VERSION)-final
 
 
 define Stage1/Configure
@@ -56,7 +56,7 @@ define Stage1/Configure
 		--target=$(REAL_GNU_TARGET_NAME) \
 		--enable-languages=c \
 		--disable-shared \
-		--with-sysroot=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+		--with-sysroot=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
 		--disable-__cxa_atexit \
 		--enable-target-optspace \
 		--with-gnu-ld \
diff --git a/openwrt/toolchain/gdb/Makefile b/openwrt/toolchain/gdb/Makefile
index f5c0bf3..63661ca 100644
--- a/openwrt/toolchain/gdb/Makefile
+++ b/openwrt/toolchain/gdb/Makefile
@@ -14,7 +14,7 @@ PKG_MD5SUM:=05b928f41fa5b482e49ca2c24762a0ae
 PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/gdb
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
diff --git a/openwrt/toolchain/kernel-headers/Makefile b/openwrt/toolchain/kernel-headers/Makefile
index 42791f1..7b5c06c 100644
--- a/openwrt/toolchain/kernel-headers/Makefile
+++ b/openwrt/toolchain/kernel-headers/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE_URL= \
 		http://www.kernel.org/pub/linux/kernel/v2.4
 PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/linux-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -30,8 +30,8 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
 )
 
 define Build/Prepare
-	mkdir -p $(TOOL_BUILD_DIR)
-	bzcat $(DL_DIR)/$(PKG_SOURCE) | tar --wildcards -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - \
+	mkdir -p $(TOOLCHAIN_BUILD_DIR)
+	bzcat $(DL_DIR)/$(PKG_SOURCE) | tar --wildcards -C $(TOOLCHAIN_BUILD_DIR) $(TAR_OPTIONS) - \
 		linux-$(PKG_VERSION)/include \
 		linux-$(PKG_VERSION)/Makefile \
 		linux-$(PKG_VERSION)/Rules.make \
diff --git a/openwrt/toolchain/libnotimpl/Makefile b/openwrt/toolchain/libnotimpl/Makefile
index d55bf4e..8515672 100644
--- a/openwrt/toolchain/libnotimpl/Makefile
+++ b/openwrt/toolchain/libnotimpl/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnotimpl
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/libnotimpl
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/libnotimpl
 
 include $(INCLUDE_DIR)/host-build.mk
 
diff --git a/openwrt/toolchain/uClibc/Makefile b/openwrt/toolchain/uClibc/Makefile
index a99c734..7329112 100644
--- a/openwrt/toolchain/uClibc/Makefile
+++ b/openwrt/toolchain/uClibc/Makefile
@@ -15,7 +15,7 @@ PKG_SOURCE_URL:=http://www.uclibc.org/downloads
 PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/uClibc-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -52,13 +52,13 @@ endif
 ifeq ($(CONFIG_SOFT_FLOAT),y)
 	$(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(PKG_BUILD_DIR)/.config
 endif
-	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
-	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
-	mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib
+	mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/include
+	mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/lib
+	mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/lib
 	PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
-		PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+		PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
 		DEVEL_PREFIX=/usr/ \
-		RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+		RUNTIME_PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
 		HOSTCC="$(HOSTCC)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		pregen install_dev;
@@ -92,7 +92,7 @@ define Build/Install
 endef
 
 define Build/Clean
-	rm -rf $(PKG_BUILD_DIR) $(TOOL_BUILD_DIR)/uClibc_dev
+	rm -rf $(PKG_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)/uClibc_dev
 endef
 
 $(eval $(call HostBuild))
diff --git a/openwrt/tools/Makefile b/openwrt/tools/Makefile
new file mode 100644
index 0000000..21d6a94
--- /dev/null
+++ b/openwrt/tools/Makefile
@@ -0,0 +1,61 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# Main makefile for the host tools
+#
+include $(TOPDIR)/rules.mk
+TARGETS-y:=sed sstrip ipkg-utils ext2fs squashfs mtd-utils lzma mkimage
+
+TARGETS_DOWNLOAD:=$(patsubst %,%-download,$(TARGETS-y))
+TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS-y))
+TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS-y))
+
+all: install
+download: $(TARGETS_DOWNLOAD)
+install: $(TARGETS_INSTALL)
+clean: $(TARGETS_CLEAN)
+
+squashfs-compile: lzma-install
+
+TOOL_STAMP_DIR:=$(STAGING_DIR)/stampfiles
+
+$(TOOL_STAMP_DIR):
+	mkdir -p $@
+
+$(STAGING_DIR):
+	@mkdir -p $@/lib
+	@mkdir -p $@/include
+	@mkdir -p $@/$(REAL_GNU_TARGET_NAME)
+	@ln -sf ../lib $@/$(REAL_GNU_TARGET_NAME)/lib
+
+$(TOOL_BUILD_DIR):
+	@mkdir -p $@
+
+%-download: FORCE
+	$(MAKE) -C $(patsubst %-download,%,$@) download
+
+%-prepare: $(TOOL_STAMP_DIR) $(STAGING_DIR) $(TOOL_BUILD_DIR) FORCE
+	@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
+		$(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
+	}
+	@touch $(TOOL_STAMP_DIR)/.tool_$@
+
+%-compile: %-prepare 
+	@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
+		$(MAKE) -C $(patsubst %-compile,%,$@) compile; \
+	}
+	@touch $(TOOL_STAMP_DIR)/.tool_$@
+
+%-install: %-compile
+	@[ -f $(TOOL_STAMP_DIR)/.tool_$@ ] || { \
+		$(MAKE) -C $(patsubst %-install,%,$@) install; \
+	}
+	@touch $(TOOL_STAMP_DIR)/.tool_$@
+
+%-clean: FORCE
+	@$(MAKE) -C $(patsubst %-clean,%,$@) clean
+	@rm -f $(TOOL_STAMP_DIR)/.tool_$(patsubst %-clean,%,$@)-*
+
diff --git a/openwrt/toolchain/ext2fs/Makefile b/openwrt/tools/ext2fs/Makefile
index dd60a7e..dd60a7e 100644
--- a/openwrt/toolchain/ext2fs/Makefile
+++ b/openwrt/tools/ext2fs/Makefile
diff --git a/openwrt/toolchain/ipkg-utils/Makefile b/openwrt/tools/ipkg-utils/Makefile
index 06bb2ad..06bb2ad 100644
--- a/openwrt/toolchain/ipkg-utils/Makefile
+++ b/openwrt/tools/ipkg-utils/Makefile
diff --git a/openwrt/toolchain/ipkg-utils/patches/100-build_clean.patch b/openwrt/tools/ipkg-utils/patches/100-build_clean.patch
index 4cff731..4cff731 100644
--- a/openwrt/toolchain/ipkg-utils/patches/100-build_clean.patch
+++ b/openwrt/tools/ipkg-utils/patches/100-build_clean.patch
diff --git a/openwrt/toolchain/ipkg-utils/patches/110-buildpackage.patch b/openwrt/tools/ipkg-utils/patches/110-buildpackage.patch
index d0a3048..d0a3048 100644
--- a/openwrt/toolchain/ipkg-utils/patches/110-buildpackage.patch
+++ b/openwrt/tools/ipkg-utils/patches/110-buildpackage.patch
diff --git a/openwrt/toolchain/ipkg-utils/patches/120-build_tar.patch b/openwrt/tools/ipkg-utils/patches/120-build_tar.patch
index 441d3ad..441d3ad 100644
--- a/openwrt/toolchain/ipkg-utils/patches/120-build_tar.patch
+++ b/openwrt/tools/ipkg-utils/patches/120-build_tar.patch
diff --git a/openwrt/toolchain/ipkg-utils/patches/130-tar_wildcards.patch b/openwrt/tools/ipkg-utils/patches/130-tar_wildcards.patch
index 80a7d1d..80a7d1d 100644
--- a/openwrt/toolchain/ipkg-utils/patches/130-tar_wildcards.patch
+++ b/openwrt/tools/ipkg-utils/patches/130-tar_wildcards.patch
diff --git a/openwrt/toolchain/lzma/Makefile b/openwrt/tools/lzma/Makefile
index 47f21d1..47f21d1 100644
--- a/openwrt/toolchain/lzma/Makefile
+++ b/openwrt/tools/lzma/Makefile
diff --git a/openwrt/toolchain/lzma/patches/100-lzma_zlib.patch b/openwrt/tools/lzma/patches/100-lzma_zlib.patch
index 7121053..7121053 100644
--- a/openwrt/toolchain/lzma/patches/100-lzma_zlib.patch
+++ b/openwrt/tools/lzma/patches/100-lzma_zlib.patch
diff --git a/openwrt/toolchain/mkimage/Makefile b/openwrt/tools/mkimage/Makefile
index 71285d2..71285d2 100644
--- a/openwrt/toolchain/mkimage/Makefile
+++ b/openwrt/tools/mkimage/Makefile
diff --git a/openwrt/toolchain/mkimage/src/crc32.c b/openwrt/tools/mkimage/src/crc32.c
index 9294fcb..9294fcb 100644
--- a/openwrt/toolchain/mkimage/src/crc32.c
+++ b/openwrt/tools/mkimage/src/crc32.c
diff --git a/openwrt/toolchain/mkimage/src/image.h b/openwrt/tools/mkimage/src/image.h
index af37bca..af37bca 100644
--- a/openwrt/toolchain/mkimage/src/image.h
+++ b/openwrt/tools/mkimage/src/image.h
diff --git a/openwrt/toolchain/mkimage/src/mkimage.c b/openwrt/tools/mkimage/src/mkimage.c
index 6490da8..6490da8 100644
--- a/openwrt/toolchain/mkimage/src/mkimage.c
+++ b/openwrt/tools/mkimage/src/mkimage.c
diff --git a/openwrt/toolchain/jffs2/Makefile b/openwrt/tools/mtd-utils/Makefile
index a0a2677..a0a2677 100644
--- a/openwrt/toolchain/jffs2/Makefile
+++ b/openwrt/tools/mtd-utils/Makefile
diff --git a/openwrt/toolchain/jffs2/patches/100-gcc4_fix.patch b/openwrt/tools/mtd-utils/patches/100-gcc4_fix.patch
index 50c8edb..50c8edb 100644
--- a/openwrt/toolchain/jffs2/patches/100-gcc4_fix.patch
+++ b/openwrt/tools/mtd-utils/patches/100-gcc4_fix.patch
diff --git a/openwrt/toolchain/sed/Makefile b/openwrt/tools/sed/Makefile
index b316991..b316991 100644
--- a/openwrt/toolchain/sed/Makefile
+++ b/openwrt/tools/sed/Makefile
diff --git a/openwrt/toolchain/sed/sedcheck.sh b/openwrt/tools/sed/sedcheck.sh
index de15ac2..de15ac2 100755
--- a/openwrt/toolchain/sed/sedcheck.sh
+++ b/openwrt/tools/sed/sedcheck.sh
diff --git a/openwrt/toolchain/squashfs/Makefile b/openwrt/tools/squashfs/Makefile
index 8e37a15..8e37a15 100644
--- a/openwrt/toolchain/squashfs/Makefile
+++ b/openwrt/tools/squashfs/Makefile
diff --git a/openwrt/toolchain/squashfs/patches/100-lzma.patch b/openwrt/tools/squashfs/patches/100-lzma.patch
index 85aa21f..85aa21f 100644
--- a/openwrt/toolchain/squashfs/patches/100-lzma.patch
+++ b/openwrt/tools/squashfs/patches/100-lzma.patch
diff --git a/openwrt/toolchain/sstrip/Makefile b/openwrt/tools/sstrip/Makefile
index dc3ff4f..dc3ff4f 100644
--- a/openwrt/toolchain/sstrip/Makefile
+++ b/openwrt/tools/sstrip/Makefile
diff --git a/openwrt/toolchain/sstrip/include/elf.h b/openwrt/tools/sstrip/include/elf.h
index eae96d0..eae96d0 100644
--- a/openwrt/toolchain/sstrip/include/elf.h
+++ b/openwrt/tools/sstrip/include/elf.h
diff --git a/openwrt/toolchain/sstrip/src/sstrip.c b/openwrt/tools/sstrip/src/sstrip.c
index 60c12c9..60c12c9 100644
--- a/openwrt/toolchain/sstrip/src/sstrip.c
+++ b/openwrt/tools/sstrip/src/sstrip.c