From 6e2823c1fa3c470da2a14f0f9aa985d71c9ffb90 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Fri, 17 Nov 2006 15:43:51 +0000 Subject: - add and use BR2_BZCAT config option. --- toolchain/binutils/binutils.mk | 5 +++-- toolchain/gcc/gcc-uclibc-3.x.mk | 2 +- toolchain/gdb/gdb.mk | 6 +++--- toolchain/kernel-headers/kernel-headers.mk | 15 ++++++++++++--- toolchain/uClibc/uclibc.mk | 5 +++-- 5 files changed, 22 insertions(+), 11 deletions(-) (limited to 'toolchain') diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 2df68bd0f..98e08597d 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -4,9 +4,10 @@ # ############################################################# 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.17) BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/ @@ -32,7 +33,7 @@ endif BINUTILS_SOURCE:=binutils-$(BINUTILS_VERSION).tar.bz2 BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION) -BINUTILS_CAT:=bzcat +BINUTILS_CAT:=$(BZCAT) BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)-build diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 258a335bd..31c5d4b5f 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -28,7 +28,7 @@ endif GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2 GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER) -GCC_CAT:=bzcat +GCC_CAT:=$(BZCAT) GCC_STRIP_HOST_BINARIES:=true ############################################################# diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index e75a23642..366cbed98 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -4,18 +4,18 @@ # ###################################################################### GDB_VERSION:=$(strip $(subst ",, $(BR2_GDB_VERSION))) -#" +#")) ifeq ($(GDB_VERSION),snapshot) # Be aware that this changes daily.... GDB_SITE:=ftp://sources.redhat.com/pub/gdb/snapshots/current GDB_SOURCE:=gdb.tar.bz2 -GDB_CAT:=bzcat +GDB_CAT:=$(BZCAT) GDB_DIR:=$(TOOL_BUILD_DIR)/gdb-$(GDB_VERSION) else GDB_SITE:=http://ftp.gnu.org/gnu/gdb GDB_SOURCE:=gdb-$(GDB_VERSION).tar.bz2 -GDB_CAT:=bzcat +GDB_CAT:=$(BZCAT) GDB_DIR:=$(TOOL_BUILD_DIR)/gdb-$(GDB_VERSION) diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index afad596eb..f73a67794 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -7,7 +7,7 @@ # ############################################################# DEFAULT_KERNEL_HEADERS:=$(strip $(subst ",, $(BR2_DEFAULT_KERNEL_HEADERS))) -#" +#")) LINUX_HEADERS_SITE:=127.0.0.1 LINUX_HEADERS_SOURCE:=unspecified-kernel-headers LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-null @@ -18,6 +18,7 @@ PATCHLEVEL:=4 SUBLEVEL:=25 LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.25.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.25 endif @@ -26,6 +27,7 @@ VERSION:=2 PATCHLEVEL:=4 SUBLEVEL:=27 LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.27.tar.bz2 LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.27 endif @@ -36,6 +38,7 @@ PATCHLEVEL:=4 SUBLEVEL:=29 LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.29.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.29 endif @@ -45,6 +48,7 @@ PATCHLEVEL:=4 SUBLEVEL:=31 LINUX_HEADERS_SITE:=http://www.uclibc.org/downloads/toolchain LINUX_HEADERS_SOURCE:=linux-libc-headers-2.4.31.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.4.31 endif @@ -54,6 +58,7 @@ PATCHLEVEL:=6 SUBLEVEL:=9 LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.9.1.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.9.1 endif @@ -63,6 +68,7 @@ PATCHLEVEL:=6 SUBLEVEL:=10 LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.10.0.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.10.0 endif @@ -72,6 +78,7 @@ PATCHLEVEL:=6 SUBLEVEL:=11 LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.11.0.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.11.0 endif @@ -81,6 +88,7 @@ PATCHLEVEL:=6 SUBLEVEL:=12 LINUX_HEADERS_SITE:=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/ LINUX_HEADERS_SOURCE:=linux-libc-headers-2.6.12.0.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-libc-headers-2.6.12.0 endif LINUX_HEADERS_IS_KERNEL=n @@ -91,6 +99,7 @@ PATCHLEVEL:=6 SUBLEVEL:=18 LINUX_HEADERS_SITE:=http://www.kernel.org/pub/linux/kernel/v2.6/ LINUX_HEADERS_SOURCE:=linux-2.6.18.tar.bz2 +LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOL_BUILD_DIR)/linux-2.6.18 LINUX_HEADERS_IS_KERNEL=y endif @@ -115,14 +124,14 @@ ifeq ($(LINUX_HEADERS_DO_MOVE),y) $(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) rm -rf $(LINUX_HEADERS_DIR) mkdir -p $(TOOL_BUILD_DIR) - bzcat $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + $(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - mv $(LINUX_HEADERS_UNPACK_DIR) $(LINUX_HEADERS_DIR) touch $(LINUX_HEADERS_DIR)/.unpacked else $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) rm -rf $(LINUX_HEADERS_DIR) mkdir -p $(TOOL_BUILD_DIR) - bzcat $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + $(LINUX_HEADERS_CAT) $(DL_DIR)/$(LINUX_HEADERS_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - touch $(LINUX_HEADERS_UNPACK_DIR)/.unpacked endif diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index f2933d453..ca1e49a6b 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -12,7 +12,7 @@ ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) # Be aware that this changes daily.... UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2 -#" +#")) UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots else UCLIBC_VER:=0.9.28 @@ -20,6 +20,7 @@ UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VER) UCLIBC_SOURCE:=uClibc-$(UCLIBC_VER).tar.bz2 UCLIBC_SITE:=http://www.uclibc.org/downloads endif +UCLIBC_CAT:=$(BZCAT) UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ -e 's/i.86/i386/' \ @@ -59,7 +60,7 @@ $(DL_DIR)/$(UCLIBC_SOURCE): uclibc-unpacked: $(UCLIBC_DIR)/.unpacked $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) mkdir -p $(TOOL_BUILD_DIR) - bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(UCLIBC_DIR) toolchain/uClibc/ \*.patch touch $(UCLIBC_DIR)/.unpacked -- cgit v1.2.3