aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in12
-rw-r--r--Makefile2
-rw-r--r--package/Makefile.in22
-rw-r--r--package/autoconf/autoconf.mk2
-rw-r--r--package/automake/automake.mk2
-rw-r--r--package/bison/bison.mk2
-rw-r--r--package/boa/boa.mk3
-rw-r--r--package/busybox/busybox.mk2
-rw-r--r--package/coreutils/coreutils.mk2
-rw-r--r--package/cvs/cvs.mk2
-rw-r--r--package/dillo/dillo.mk2
-rw-r--r--package/distcc/distcc.mk3
-rw-r--r--package/dmraid/dmraid.mk2
-rw-r--r--package/expat/expat.mk3
-rw-r--r--package/freetype/freetype.mk2
-rw-r--r--package/gawk/gawk.mk2
-rw-r--r--package/gmp/gmp.mk2
-rw-r--r--package/ipsec-tools/ipsec-tools.mk3
-rw-r--r--package/iptables/iptables.mk3
-rw-r--r--package/libcgicc/libcgicc.mk2
-rw-r--r--package/libpng/libpng.mk2
-rw-r--r--package/lsof/lsof.mk2
-rw-r--r--package/lzma/lzma.mk5
-rw-r--r--package/m4/m4.mk2
-rw-r--r--package/make/make.mk2
-rw-r--r--package/mdadm/mdadm.mk3
-rw-r--r--package/microperl/microperl.mk3
-rw-r--r--package/module-init-tools/module-init-tools.mk5
-rw-r--r--package/modutils/modutils.mk5
-rw-r--r--package/mpfr/mpfr.mk2
-rw-r--r--package/mpg123/mpg123.mk3
-rw-r--r--package/mtd/mtd.mk10
-rw-r--r--package/nbd/nbd.mk2
-rw-r--r--package/ncurses/ncurses.mk3
-rw-r--r--package/newt/newt.mk3
-rw-r--r--package/openssl/openssl.mk3
-rw-r--r--package/pciutils/pciutils.mk4
-rw-r--r--package/portage/portage.mk2
-rw-r--r--package/python/python.mk2
-rw-r--r--package/sfdisk/sfdisk.mk3
-rw-r--r--package/slang/slang.mk3
-rw-r--r--package/socat/socat.mk3
-rw-r--r--package/strace/strace.mk2
-rw-r--r--package/tar/tar.mk2
-rw-r--r--package/tftpd/tftpd.mk2
-rw-r--r--package/tinylogin/tinylogin.mk3
-rw-r--r--package/tinyx/tinyx.mk2
-rw-r--r--package/tn5250/tn5250.mk3
-rw-r--r--package/udev/udev.mk2
-rw-r--r--package/uemacs/uemacs.mk3
-rw-r--r--package/util-linux/util-linux.mk2
-rw-r--r--package/valgrind/valgrind.mk3
-rw-r--r--package/xorg/xorg.mk2
-rw-r--r--package/zlib/zlib.mk3
-rw-r--r--target/device/AMD/DBAu1500/linux.mk3
-rw-r--r--target/device/Sharp/LNode80/linux.mk3
-rw-r--r--target/device/Soekris/net4521/linux.mk3
-rw-r--r--target/device/Soekris/net4801/linux.mk3
-rw-r--r--target/device/Via/epia-mii/linux.mk3
-rw-r--r--target/device/jp/q5/linux.mk3
-rw-r--r--target/iso9660/iso9660.mk3
-rw-r--r--target/x86/syslinux/syslinux.mk3
-rw-r--r--toolchain/binutils/binutils.mk5
-rw-r--r--toolchain/gcc/gcc-uclibc-3.x.mk2
-rw-r--r--toolchain/gdb/gdb.mk6
-rw-r--r--toolchain/kernel-headers/kernel-headers.mk15
-rw-r--r--toolchain/uClibc/uclibc.mk5
67 files changed, 146 insertions, 87 deletions
diff --git a/Config.in b/Config.in
index 9d4ee7b9ee..e0afbf09d2 100644
--- a/Config.in
+++ b/Config.in
@@ -188,7 +188,17 @@ config BR2_ZCAT
zcat is identical to gunzip -c except that the former may
not be available on your system.
Default is "zcat"
- Other possible values include "gunzip -c"
+ Other possible values include "gunzip -c" or "gzip -d -c".
+
+config BR2_BZCAT
+ string "bzcat command"
+ default "bzcat"
+ help
+ Command to be used to extract a bzip2'ed file to stdout.
+ bzcat is identical to bunzip2 -c except that the former may
+ not be available on your system.
+ Default is "bzcat"
+ Other possible values include "bunzip2 -c" or "bzip2 -d -c".
config BR2_TAR_OPTIONS
string "Tar options"
diff --git a/Makefile b/Makefile
index 0e21be0e66..bc1772e828 100644
--- a/Makefile
+++ b/Makefile
@@ -75,8 +75,8 @@ TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
TARGETS_SOURCE:=$(patsubst %,%-source,$(TARGETS))
TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
+world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
dirs: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR)
-world: dirs $(TARGET_DIR) $(TARGETS)
.PHONY: all world dirs clean dirclean distclean source $(TARGETS) \
$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
diff --git a/package/Makefile.in b/package/Makefile.in
index f541d7ca8c..8fa677c70b 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -3,15 +3,17 @@ MAKE=make -j$(BR2_JLEVEL)
# Strip off the annoying quoting
ARCH:=$(strip $(subst ",, $(BR2_ARCH)))
-#"
+#"))
WGET:=$(strip $(subst ",, $(BR2_WGET)))
-#"
+#"))
SVN:=$(strip $(subst ",, $(BR2_SVN)))
-#"
+#"))
ZCAT:=$(strip $(subst ",, $(BR2_ZCAT)))
-#"
+#"))
+BZCAT:=$(strip $(subst ",, $(BR2_BZCAT)))
+#"))
TAR_OPTIONS=$(subst ",, $(BR2_TAR_OPTIONS)) -xf
-#"
+#")
@@ -25,7 +27,9 @@ HOSTCC:=gcc
BASE_DIR:=${shell pwd}
TOPDIR_PREFIX:=$(strip $(subst ",, $(BR2_TOPDIR_PREFIX)))_
+#"))
TOPDIR_SUFFIX:=_$(strip $(subst ",, $(BR2_TOPDIR_SUFFIX)))
+#"))
ifeq ($(TOPDIR_PREFIX),_)
TOPDIR_PREFIX:=
endif
@@ -34,6 +38,7 @@ TOPDIR_SUFFIX:=
endif
DL_DIR=$(strip $(subst ",, $(BR2_DL_DIR)))
+#"))
ifeq ($(DL_DIR),)
DL_DIR:=$(BASE_DIR)/dl
endif
@@ -43,9 +48,11 @@ TARGET_DIR:=$(BUILD_DIR)/root
TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
GNU_TARGET_SUFFIX:=-$(strip $(subst ",, $(BR2_GNU_TARGET_SUFFIX)))
-# Strip off the annoying quoting
+#"))
+
STAGING_DIR:=$(strip $(subst ",, $(BR2_STAGING_DIR)))
-#"
+#"))
+
TARGET_PATH=$(STAGING_DIR)/bin:$(TOOL_BUILD_DIR)/bin:$(PATH)
IMAGE:=$(BASE_DIR)/rootfs.$(ARCH)$(ARCH_FPU_SUFFIX)
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
@@ -72,6 +79,7 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-e 's/i[3-9]86/i386/' \
)
GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX))
+#")
TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
AR=$(TARGET_CROSS)ar \
AS=$(TARGET_CROSS)as \
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 158d100788..cfd2e5a551 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -6,7 +6,7 @@
AUTOCONF_VER:=2.60
AUTOCONF_SOURCE:=autoconf-$(AUTOCONF_VER).tar.bz2
AUTOCONF_SITE:=http://ftp.gnu.org/pub/gnu/autoconf
-AUTOCONF_CAT:=bzcat
+AUTOCONF_CAT:=$(BZCAT)
AUTOCONF_DIR:=$(BUILD_DIR)/autoconf-$(AUTOCONF_VER)
AUTOCONF_BINARY:=autoconf
AUTOCONF_TARGET_BINARY:=usr/bin/autoconf
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 9900ee8997..be3384b297 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -6,7 +6,7 @@
AUTOMAKE_VER:=1.9.6
AUTOMAKE_SOURCE:=automake-$(AUTOMAKE_VER).tar.bz2
AUTOMAKE_SITE:=http://ftp.gnu.org/pub/gnu/automake
-AUTOMAKE_CAT:=bzcat
+AUTOMAKE_CAT:=$(BZCAT)
AUTOMAKE_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VER)
AUTOMAKE_BINARY:=automake
AUTOMAKE_TARGET_BINARY:=usr/bin/automake
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 99685205dc..7f7e5db937 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -7,7 +7,7 @@ BISON_VER:=2.3
BISON_SOURCE:=bison-$(BISON_VER).tar.bz2
BISON_SITE:=http://ftp.gnu.org/pub/gnu/bison
BISON_DIR:=$(BUILD_DIR)/bison-$(BISON_VER)
-BISON_CAT:=bzcat
+BISON_CAT:=$(BZCAT)
BISON_BINARY:=src/bison
BISON_TARGET_BINARY:=usr/bin/bison
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index 81023b46de..d01986c484 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -10,6 +10,7 @@ BOA_VERSION=0.94.14rc21
# what you are doing! Danger, Danger!
BOA_SOURCE=boa-$(BOA_VERSION).tar.gz
+BOA_CAT:=$(ZCAT)
BOA_SITE=http://www.boa.org/
BOA_DIR=$(BUILD_DIR)/${shell basename $(BOA_SOURCE) .tar.gz}
BOA_WORKDIR=$(BUILD_DIR)/boa_workdir
@@ -18,7 +19,7 @@ $(DL_DIR)/$(BOA_SOURCE):
$(WGET) -P $(DL_DIR) $(BOA_SITE)/$(BOA_SOURCE)
$(BOA_DIR)/.unpacked: $(DL_DIR)/$(BOA_SOURCE)
- gzip -d -c $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(BOA_CAT) $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(BOA_DIR)/.unpacked
$(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 6e5301f751..f108e8604e 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -15,7 +15,7 @@ BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER)
BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
BUSYBOX_SITE:=http://www.busybox.net/downloads
endif
-BUSYBOX_UNZIP=bzcat
+BUSYBOX_UNZIP=$(BZCAT)
BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
#"
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 80cd46b6e9..7d34089222 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -7,7 +7,7 @@ COREUTILS_VER:=5.96
COREUTILS_SOURCE:=coreutils-$(COREUTILS_VER).tar.bz2
#COREUTILS_SITE:=ftp://alpha.gnu.org/gnu/coreutils/
COREUTILS_SITE:=http://ftp.gnu.org/pub/gnu/coreutils
-COREUTILS_CAT:=bzcat
+COREUTILS_CAT:=$(BZCAT)
COREUTILS_DIR:=$(BUILD_DIR)/coreutils-$(COREUTILS_VER)
COREUTILS_BINARY:=src/vdir
COREUTILS_TARGET_BINARY:=bin/vdir
diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk
index 6f4c104bf9..6e9d86054f 100644
--- a/package/cvs/cvs.mk
+++ b/package/cvs/cvs.mk
@@ -7,7 +7,7 @@ CVS_VER:=1.12.12
CVS_SOURCE:=cvs-$(CVS_VER).tar.bz2
CVS_SITE:=http://ccvs.cvshome.org/files/documents/19/872/$(CVS_SOURCE)
CVS_DIR:=$(BUILD_DIR)/cvs-$(CVS_VER)
-CVS_CAT:=bzcat
+CVS_CAT:=$(BZCAT)
CVS_BINARY:=src/cvs
CVS_TARGET_BINARY:=usr/bin/cvs
diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk
index 7475e11fce..9ee724c09e 100644
--- a/package/dillo/dillo.mk
+++ b/package/dillo/dillo.mk
@@ -8,7 +8,7 @@ DILLO_VERSION=0.8.6
DILLO_SOURCE=dillo-$(DILLO_VERSION).tar.bz2
DILLO_SITE=http://www.dillo.org/download/
DILLO_DIR=$(BUILD_DIR)/dillo-$(DILLO_VERSION)
-DILLO_CAT:=bzcat
+DILLO_CAT:=$(BZCAT)
$(DL_DIR)/$(DILLO_SOURCE):
$(WGET) -P $(DL_DIR) $(DILLO_SITE)/$(DILLO_SOURCE)
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
index 6f12a5a9d0..578c3a31cd 100644
--- a/package/distcc/distcc.mk
+++ b/package/distcc/distcc.mk
@@ -5,6 +5,7 @@
#############################################################
DISTCC_VER:=2.18.3
DISTCC_SOURCE:=distcc-$(DISTCC_VER).tar.bz2
+DISTCC_CAT:=$(BZCAT)
DISTCC_SITE:=http://distcc.samba.org/ftp/distcc/
DISTCC_DIR:=$(BUILD_DIR)/distcc-$(DISTCC_VER)
DISTCC_BINARY:=distcc
@@ -14,7 +15,7 @@ $(DL_DIR)/$(DISTCC_SOURCE):
$(WGET) -P $(DL_DIR) $(DISTCC_SITE)/$(DISTCC_SOURCE)
$(DISTCC_DIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE)
- bzcat $(DL_DIR)/$(DISTCC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(DISTCC_CAT) $(DL_DIR)/$(DISTCC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(DISTCC_DIR)/.unpacked
$(DISTCC_DIR)/.configured: $(DISTCC_DIR)/.unpacked
diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk
index 9a82a6011f..4c02c0b711 100644
--- a/package/dmraid/dmraid.mk
+++ b/package/dmraid/dmraid.mk
@@ -8,7 +8,7 @@ DMRAID_VERSION=1.0.0.rc11
DMRAID_SOURCE:=dmraid-$(DMRAID_VERSION).tar.bz2
DMRAID_SITE:=http://people.redhat.com/~heinzm/sw/dmraid/src
DMRAID_DIR:=$(BUILD_DIR)/dmraid/$(DMRAID_VERSION)
-DMRAID_CAT:=bzcat
+DMRAID_CAT:=$(BZCAT)
DMRAID_BINARY:=dmraid
DMRAID_STAGING_BINARY:=$(DMRAID_DIR)/STAGING_DIR)/tools/$(DMRAID_BINARY)
DMRAID_TARGET_BINARY:=$(TARGET_DIR)/sbin/$(DMRAID_BINARY)
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 6aebaed40a..2b10d0bdd3 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -7,6 +7,7 @@
EXPAT_VERSION=2.0.0
EXPAT_SOURCE=expat-$(EXPAT_VERSION).tar.gz
+EXPAT_CAT:=$(ZCAT)
EXPAT_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
EXPAT_DIR:=$(BUILD_DIR)/expat-$(EXPAT_VERSION)
@@ -16,7 +17,7 @@ $(DL_DIR)/$(EXPAT_SOURCE):
expat-source: $(DL_DIR)/$(EXPAT_SOURCE)
$(EXPAT_DIR)/.unpacked: $(DL_DIR)/$(EXPAT_SOURCE)
- gunzip -c $(DL_DIR)/$(EXPAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(EXPAT_CAT) $(DL_DIR)/$(EXPAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(EXPAT_DIR)/.unpacked
$(EXPAT_DIR)/.configured: $(EXPAT_DIR)/.unpacked
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index ab051191f0..229278e779 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -6,7 +6,7 @@
FREETYPE_VERSION:=2.1.9
FREETYPE_SOURCE:=freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
-FREETYPE_CAT:=bzcat
+FREETYPE_CAT:=$(BZCAT)
FREETYPE_DIR:=$(BUILD_DIR)/freetype-$(FREETYPE_VERSION)
$(DL_DIR)/$(FREETYPE_SOURCE):
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 81f8ae878a..cfe4e90c15 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -6,7 +6,7 @@
GAWK_VER:=3.1.5
GAWK_SOURCE:=gawk-$(GAWK_VER).tar.bz2
GAWK_SITE:=http://ftp.gnu.org/pub/gnu/gawk
-GAWK_CAT:=bzcat
+GAWK_CAT:=$(BZCAT)
GAWK_DIR:=$(BUILD_DIR)/gawk-$(GAWK_VER)
GAWK_BINARY:=gawk
GAWK_TARGET_BINARY:=usr/bin/gawk
diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk
index 2344b8d14c..07fab88618 100644
--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -6,7 +6,7 @@
GMP_VERSION:=4.2.1
GMP_SOURCE:=gmp-$(GMP_VERSION).tar.bz2
GMP_SITE:=http://ftp.sunet.se/pub/gnu/gmp/
-GMP_CAT:=bzcat
+GMP_CAT:=$(BZCAT)
GMP_DIR:=$(BUILD_DIR)/gmp-$(GMP_VERSION)
GMP_BINARY:=libgmp.a
GMP_LIBVERSION:=3.4.1
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 7fedf5f3a4..f80a67b3dd 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -6,6 +6,7 @@
IPSEC_TOOLS_VER:=0.6.6
IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VER).tar.bz2
+IPSEC_TOOLS_CAT:=$(BZCAT)
IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VER)
IPSEC_TOOLS_BINARY_SETKEY:=src/setkey/setkey
@@ -64,7 +65,7 @@ $(DL_DIR)/$(IPSEC_TOOLS_SOURCE):
$(IPSEC_TOOLS_DIR)/.source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
- bunzip2 -c $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(IPSEC_TOOLS_CAT) $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(IPSEC_TOOLS_DIR) package/ipsec-tools ipsec-tools-$(IPSEC_TOOLS_VER)\*.patch
touch $(IPSEC_TOOLS_DIR)/.source
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 15f0fbf78c..0942a616bb 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -6,13 +6,14 @@
IPTABLES_VER:=1.3.5
IPTABLES_SOURCE_URL:=ftp.netfilter.org/pub/iptables/
IPTABLES_SOURCE:=iptables-$(IPTABLES_VER).tar.bz2
+IPTABLES_CAT:=$(BZCAT)
IPTABLES_BUILD_DIR:=$(BUILD_DIR)/iptables-$(IPTABLES_VER)
$(DL_DIR)/$(IPTABLES_SOURCE):
$(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE)
$(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE)
- bzcat $(DL_DIR)/$(IPTABLES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(IPTABLES_CAT) $(DL_DIR)/$(IPTABLES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(IPTABLES_BUILD_DIR)/.unpacked
$(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked
diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk
index 6601c54437..ed8461f339 100644
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -8,7 +8,7 @@ LIBCGICC_VERSION=3.2.3
LIBCGICC_DIR=$(BUILD_DIR)/cgicc-$(LIBCGICC_VERSION)
LIBCGICC_SITE=http://www.cgicc.org/files
LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.bz2
-LIBCGICC_CAT:=bzcat
+LIBCGICC_CAT:=$(BZCAT)
$(DL_DIR)/$(LIBCGICC_SOURCE):
$(WGET) -P $(DL_DIR) $(LIBCGICC_SITE)/$(LIBCGICC_SOURCE)
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 7ea0e615d6..4cf86d141d 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -25,7 +25,7 @@ LIBPNG_VER:=1.2.12
LIBPNG_DIR:=$(BUILD_DIR)/libpng-$(LIBPNG_VER)
LIBPNG_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpng
LIBPNG_SOURCE:=libpng-$(LIBPNG_VER).tar.bz2
-LIBPNG_CAT:=bzcat
+LIBPNG_CAT:=$(BZCAT)
$(DL_DIR)/$(LIBPNG_SOURCE):
$(WGET) -P $(DL_DIR) $(LIBPNG_SITE)/$(LIBPNG_SOURCE)
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 268bde3475..916b464efb 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -5,7 +5,7 @@
#############################################################
LSOF_SOURCE:=lsof_4.77.tar.bz2
LSOF_SITE:=ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
-LSOF_CAT:=bzip2 -cd
+LSOF_CAT:=$(BZCAT)
LSOF_DIR:=$(BUILD_DIR)/lsof_4.77
LSOF_BINARY:=lsof
LSOF_TARGET_BINARY:=bin/lsof
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index d0f223434c..a0ba0f7847 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -5,6 +5,7 @@
#############################################################
LZMA_VER:=4.32.0beta3
LZMA_SOURCE:=lzma-$(LZMA_VER).tar.gz
+LZMA_CAT:=$(ZCAT)
LZMA_SITE:=http://tukaani.org/lzma/
LZMA_HOST_DIR:=$(TOOL_BUILD_DIR)/lzma-$(LZMA_VER)
LZMA_TARGET_DIR:=$(BUILD_DIR)/lzma-$(LZMA_VER)
@@ -26,7 +27,7 @@ $(DL_DIR)/$(LZMA_SOURCE):
######################################################################
$(LZMA_HOST_DIR)/.source: $(DL_DIR)/$(LZMA_SOURCE)
- zcat $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ $(LZMA_CAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LZMA_HOST_DIR) package/lzma/ lzma\*.patch
touch $(LZMA_HOST_DIR)/.source
@@ -54,7 +55,7 @@ lzma-host: uclibc $(STAGING_DIR)/bin/lzma
######################################################################
$(LZMA_TARGET_DIR)/.source: $(DL_DIR)/$(LZMA_SOURCE)
- zcat $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(LZMA_CAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LZMA_TARGET_DIR) package/lzma/ lzma\*.patch
touch $(LZMA_TARGET_DIR)/.source
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index af70124772..255f52c85d 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -5,8 +5,8 @@
#############################################################
M4_VER:=1.4.4
M4_SOURCE:=m4-$(M4_VER).tar.bz2
+M4_CAT:=$(BZCAT)
M4_SITE:=http://ftp.gnu.org/pub/gnu/m4
-M4_CAT:=bzcat
M4_DIR:=$(BUILD_DIR)/m4-$(M4_VER)
M4_BINARY:=m4
M4_TARGET_BINARY:=usr/bin/m4
diff --git a/package/make/make.mk b/package/make/make.mk
index 91daf4d59d..22f9b7e8f2 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -7,7 +7,7 @@ GNUMAKE_VER:=3.81
GNUMAKE_SOURCE:=make-$(GNUMAKE_VER).tar.bz2
GNUMAKE_SITE:=http://ftp.gnu.org/pub/gnu/make
GNUMAKE_DIR:=$(BUILD_DIR)/make-$(GNUMAKE_VER)
-GNUMAKE_CAT:=bzcat
+GNUMAKE_CAT:=$(BZCAT)
GNUMAKE_BINARY:=make
GNUMAKE_TARGET_BINARY:=usr/bin/make
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index d694f30346..b2fb5246d6 100644
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -5,6 +5,7 @@
#############################################################
MDADM_VERSION:=2.4.1
MDADM_SOURCE:=mdadm-$(MDADM_VERSION).tar.bz2
+MDADM_CAT:=$(BZCAT)
MDADM_SITE:=http://www.kernel.org/pub/linux/utils/raid/mdadm
MDADM_DIR:=$(BUILD_DIR)/mdadm-$(MDADM_VERSION)
MDADM_BINARY:=mdadm
@@ -14,7 +15,7 @@ $(DL_DIR)/$(MDADM_SOURCE):
$(WGET) -P $(DL_DIR) $(MDADM_SITE)/$(MDADM_SOURCE)
$(MDADM_DIR)/.source: $(DL_DIR)/$(MDADM_SOURCE)
- bzcat $(DL_DIR)/$(MDADM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(MDADM_CAT) $(DL_DIR)/$(MDADM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(MDADM_DIR)/.source
$(MDADM_DIR)/$(MDADM_BINARY): $(MDADM_DIR)/.source
diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk
index 72836279bf..c663a79c6f 100644
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -5,6 +5,7 @@
#############################################################
MICROPERL_VER=5.8.7
MICROPERL_SOURCE=perl-$(MICROPERL_VER).tar.bz2
+MICROPERL_CAT:=$(BZCAT)
MICROPERL_SITE=ftp://ftp.cpan.org/pub/CPAN/src/5.0
MICROPERL_DIR=$(BUILD_DIR)/perl-$(MICROPERL_VER)
@@ -12,7 +13,7 @@ $(DL_DIR)/$(MICROPERL_SOURCE):
$(WGET) -P $(DL_DIR) $(MICROPERL_SITE)/$(MICROPERL_SOURCE)
$(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
- bzcat $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(MICROPERL_CAT) $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(MICROPERL_DIR)/.source
$(MICROPERL_DIR)/microperl: $(MICROPERL_DIR)/.source
diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk
index cb276f44a1..8d502e2545 100644
--- a/package/module-init-tools/module-init-tools.mk
+++ b/package/module-init-tools/module-init-tools.mk
@@ -5,6 +5,7 @@
#############################################################
MODULE_INIT_TOOLS_VERSION=3.2.2
MODULE_INIT_TOOLS_SOURCE=module-init-tools-$(MODULE_INIT_TOOLS_VERSION).tar.bz2
+MODULE_INIT_TOOLS_CAT:=$(BZCAT)
MODULE_INIT_TOOLS_SITE=http://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/
MODULE_INIT_TOOLS_DIR=$(BUILD_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_VERSION)
MODULE_INIT_TOOLS_DIR2=$(TOOL_BUILD_DIR)/module-init-tools-$(MODULE_INIT_TOOLS_VERSION)
@@ -17,7 +18,7 @@ $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE):
$(WGET) -P $(DL_DIR) $(MODULE_INIT_TOOLS_SITE)/$(MODULE_INIT_TOOLS_SOURCE)
$(MODULE_INIT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
- bzcat $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR) package/module-init-tools \*.patch
touch $(MODULE_INIT_TOOLS_DIR)/.unpacked
@@ -70,7 +71,7 @@ module-init-tools-dirclean:
$(MODULE_INIT_TOOLS_DIR2)/.source: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE)
- bzcat $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+ $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
toolchain/patch-kernel.sh $(MODULE_INIT_TOOLS_DIR2) package/module-init-tools \*.patch
touch $(MODULE_INIT_TOOLS_DIR2)/.source
diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk
index 7e6ff1e563..9d2a8f6bfc 100644
--- a/package/modutils/modutils.mk
+++ b/package/modutils/modutils.mk
@@ -4,6 +4,7 @@
#
#############################################################
MODUTILS_SOURCE=modutils-2.4.27.tar.bz2
+MODUTILS_CAT:=$(BZCAT)
MODUTILS_SITE=http://ftp.kernel.org/pub/linux/utils/kernel/modutils/v2.4/
MODUTILS_DIR1=$(BUILD_DIR)/modutils-2.4.27
MODUTILS_DIR2=$(TOOL_BUILD_DIR)/modutils-2.4.27
@@ -21,7 +22,7 @@ $(DL_DIR)/$(MODUTILS_SOURCE):
#
#############################################################
$(MODUTILS_DIR1)/.source: $(DL_DIR)/$(MODUTILS_SOURCE)
- bzcat $(DL_DIR)/$(MODUTILS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ $(MODUTILS_CAT) $(DL_DIR)/$(MODUTILS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
toolchain/patch-kernel.sh $(MODUTILS_DIR1) \
package/modutils \*.patch
touch $(MODUTILS_DIR1)/.source
@@ -74,7 +75,7 @@ DEPMOD_EXTRA_STUFF=CFLAGS=-D__MIPSEL__
endif
$(MODUTILS_DIR2)/.source: $(DL_DIR)/$(MODUTILS_SOURCE)
- bzcat $(DL_DIR)/$(MODUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
+ $(MODUTILS_CAT) $(DL_DIR)/$(MODUTILS_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf -
toolchain/patch-kernel.sh $(MODUTILS_DIR2) \
package/modutils \*.patch
touch $(MODUTILS_DIR2)/.source
diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk
index d31b134946..096937248e 100644
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -6,8 +6,8 @@
MPFR_VERSION:=2.2.0
MPFR_PATCH:=patches
MPFR_SOURCE:=mpfr-$(MPFR_VERSION).tar.bz2
+MPFR_CAT:=$(BZCAT)
MPFR_SITE:=http://www.mpfr.org/mpfr-current/
-MPFR_CAT:=bzcat
MPFR_DIR:=$(BUILD_DIR)/mpfr-$(MPFR_VERSION)
MPFR_BINARY:=libmpfr.a
MPFR_LIBVERSION:=1.0.0
diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
index c03125b39b..a0cbf2dc7d 100644
--- a/package/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
@@ -10,6 +10,7 @@ MPG123_VERSION=0.59r
# what you are doing! Danger, Danger!
MPG123_SOURCE=mpg123-$(MPG123_VERSION).tar.gz
+MPG123_CAT:=$(ZCAT)
MPG123_SITE=http://www.mpg123.de/mpg123
MPG123_DIR=$(BUILD_DIR)/${shell basename $(MPG123_SOURCE) .tar.gz}
MPG123_WORKDIR=$(BUILD_DIR)/mpg123-$(MPG123_VERSION)
@@ -18,7 +19,7 @@ $(DL_DIR)/$(MPG123_SOURCE):
$(WGET) -P $(DL_DIR) $(MPG123_SITE)/$(MPG123_SOURCE)
$(MPG123_DIR)/.unpacked: $(DL_DIR)/$(MPG123_SOURCE)
- gzip -d -c $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(MPG123_CAT) $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(MPG123_DIR)/.unpacked
$(MPG123_WORKDIR)/mpg123: $(MPG123_DIR)/.unpacked
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index aa8d25cb93..2d122e6e1e 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -7,18 +7,18 @@ ifeq ($(strip $(BR2_PACKAGE_MTD_SNAPSHOT)),y)
# Be aware that this changes daily....
TODAY:=$(shell date -u +%Y%m%d)
MTD_DL_SOURCE:=mtd-snapshot-$(TODAY).tar.bz2
+MTD_CAT:=$(BZCAT)
MTD_SOURCE:=mtd-snapshot.tar.bz2
MTD_SITE:=ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs
MTD_HOST_DIR := $(TOOL_BUILD_DIR)/mtd_snapshot
MTD_DIR:=$(BUILD_DIR)/mtd_snapshot
-MTD_UNZIP:=bzcat
else
MTD_SOURCE:=$(strip $(subst ",, $(BR2_PACKAGE_MTD_ORIG_STRING)))
#"))
MTD_SITE:=http://ftp.debian.org/debian/pool/main/m/mtd
MTD_HOST_DIR := $(TOOL_BUILD_DIR)/mtd_orig
MTD_DIR:=$(BUILD_DIR)/mtd_orig
-MTD_UNZIP:=$(ZCAT)
+MTD_CAT:=$(ZCAT)
endif
@@ -37,7 +37,7 @@ $(DL_DIR)/$(MTD_SOURCE):
mv $(DL_DIR)/$(MTD_DL_SOURCE) $(DL_DIR)/$(MTD_SOURCE)
$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE_GENERIC)
- $(MTD_UNZIP) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
mv $(TOOL_BUILD_DIR)/$(shell tar tjf $(DL_DIR)/$(MTD_SOURCE) \
| head -n 1 | xargs basename) $(MTD_HOST_DIR)
touch $(MTD_HOST_DIR)/.unpacked
@@ -48,7 +48,7 @@ $(DL_DIR)/$(MTD_SOURCE):
endif
$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
- $(MTD_UNZIP) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+ $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
mv $(TOOL_BUILD_DIR)/$(shell tar tzf $(DL_DIR)/$(MTD_SOURCE) | head -n 1 \
| xargs basename) $(MTD_HOST_DIR)
toolchain/patch-kernel.sh $(MTD_HOST_DIR) \
@@ -76,7 +76,7 @@ mtd-host-dirclean:
#
#############################################################
$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
- $(MTD_UNZIP) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifeq ($(strip $(BR2_PACKAGE_MTD_SNAPSHOT)),y)
mv $(BUILD_DIR)/$(shell tar tjf $(DL_DIR)/$(MTD_SOURCE) \
| head -n 1 | xargs basename) $(MTD_DIR)
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index 100e2a0a22..cd8d9c1e0e 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -6,9 +6,9 @@
NBD_VERSION=2.8.6
NBD_SOURCE=nbd-$(NBD_VERSION).tar.bz2
+NBD_CAT:=$(BZCAT)
NBD_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/
NBD_DIR=$(BUILD_DIR)/nbd-$(NBD_VERSION)
-NBD_CAT:=bzcat
$(DL_DIR)/$(NBD_SOURCE):
$(WGET) -P $(DL_DIR) $(NBD_SITE)/$(NBD_SOURCE)
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index d07920120e..ac9f8ad489 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -27,12 +27,13 @@ NCURSES_VER:=5.5
NCURSES_SITE:=http://ftp.gnu.org/pub/gnu/ncurses
NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VER)
NCURSES_SOURCE:=ncurses-$(NCURSES_VER).tar.gz
+NCURSES_CAT:=$(ZCAT)
$(DL_DIR)/$(NCURSES_SOURCE):
$(WGET) -P $(DL_DIR) $(NCURSES_SITE)/$(NCURSES_SOURCE)
$(NCURSES_DIR)/.dist: $(DL_DIR)/$(NCURSES_SOURCE)
- gunzip -c $(DL_DIR)/$(NCURSES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(NCURSES_CAT) $(DL_DIR)/$(NCURSES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
#use the local tic and not whatever the build system was going to find.
$(SED) 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \
$(NCURSES_DIR)/misc/run_tic.in
diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index 7f72f33812..58b6592d52 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -4,6 +4,7 @@
#
#############################################################
NEWT_SOURCE=newt-0.51.0.tar.bz2
+NEWT_CAT:=$(BZCAT)
NEWT_SITE=http://www.uclibc.org/
NEWT_DIR=$(BUILD_DIR)/newt-0.51.0
NEWT_VERSION=0.51.0
@@ -18,7 +19,7 @@ $(DL_DIR)/$(NEWT_SOURCE):
$(WGET) -P $(DL_DIR) $(NEWT_SITE)/$(NEWT_SOURCE)
$(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE)
- bzcat $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(NEWT_CAT) $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(NEWT_DIR)/.source;
$(NEWT_DIR)/.configured: $(NEWT_DIR)/.source
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 32a52eb576..00baeddb76 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -8,6 +8,7 @@
OPENSSL_VER:=0.9.7e
OPENSSL_SITE:=http://www.openssl.org/source
OPENSSL_SOURCE:=openssl-$(OPENSSL_VER).tar.gz
+OPENSSL_CAT:=$(ZCAT)
OPENSSL_DIR:=$(BUILD_DIR)/openssl-$(OPENSSL_VER)
OPENSSL_TARGET_ARCH:=
@@ -28,7 +29,7 @@ $(DL_DIR)/$(OPENSSL_SOURCE):
openssl-unpack: $(OPENSSL_DIR)/.unpacked
$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE)
- gunzip -c $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(OPENSSL_CAT) $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch
# sigh... we have to resort to this just to set a gcc flag.
$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 8f36b53bb9..52004df6b1 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -5,14 +5,14 @@
#############################################################
PCIUTILS_VER:=2.1.11
PCIUTILS_SOURCE:=pciutils-$(PCIUTILS_VER).tar.gz
+PCIUTILS_CAT:=$(ZCAT)
PCIUTILS_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
PCIUTILS_DIR:=$(BUILD_DIR)/pciutils-$(PCIUTILS_VER)
-PCIUTILS_CAT:=$(ZCAT)
# Yet more targets...
PCIIDS_SITE:=http://pciids.sourceforge.net/
PCIIDS_SOURCE:=pci.ids.bz2
-PCIIDS_CAT:=bzcat
+PCIIDS_CAT:=$(BZCAT)
$(DL_DIR)/$(PCIUTILS_SOURCE):
$(WGET) -P $(DL_DIR) $(PCIUTILS_SITE)/$(PCIUTILS_SOURCE)
diff --git a/package/portage/portage.mk b/package/portage/portage.mk
index 38552b31e7..3fa023846c 100644
--- a/package/portage/portage.mk
+++ b/package/portage/portage.mk
@@ -6,7 +6,7 @@
PORTAGE_VERSION:=2.0.51.22
PORTAGE_SOURCE:=portage-$(PORTAGE_VERSION).tar.bz2
PORTAGE_SITE:=http://gentoo.osuosl.org/distfiles
-PORTAGE_CAT:=bzcat
+PORTAGE_CAT:=$(BZCAT)
PORTAGE_DIR:=$(BUILD_DIR)/portage-$(PORTAGE_VERSION)
PORTAGE_TARGET_DIR:=$(TARGET_DIR)/usr/lib/portage
PORTAGE_TARGET_BINARY:=usr/bin/emerge
diff --git a/package/python/python.mk b/package/python/python.mk
index ebd0828165..c51ada4825 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -7,7 +7,7 @@ PYTHON_VERSION=2.4.2
PYTHON_SOURCE:=Python-$(PYTHON_VERSION).tar.bz2
PYTHON_SITE:=http://python.org/ftp/python/$(PYTHON_VERSION)
PYTHON_DIR:=$(BUILD_DIR)/Python-$(PYTHON_VERSION)
-PYTHON_CAT:=bzcat
+PYTHON_CAT:=$(BZCAT)
PYTHON_BINARY:=python
PYTHON_TARGET_BINARY:=usr/bin/python
diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk
index 4cd76a6ebe..0e09aa80dc 100644
--- a/package/sfdisk/sfdisk.mk
+++ b/package/sfdisk/sfdisk.mk
@@ -4,6 +4,7 @@
#
#############################################################
SFDISK_SOURCE=sfdisk.tar.bz2
+SFDISK_CAT:=$(BZCAT)
SFDISK_SITE:=http://www.uclibc.org/
SFDISK_DIR=$(BUILD_DIR)/sfdisk
@@ -11,7 +12,7 @@ $(DL_DIR)/$(SFDISK_SOURCE):
$(WGET) -P $(DL_DIR) $(SFDISK_SITE)/$(SFDISK_SOURCE)
$(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE)
- bzcat $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch
touch $@
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index 92c29b4b16..fd96cebaba 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -4,6 +4,7 @@
#
#############################################################
SLANG_SOURCE=slang-1.4.5-mini.tar.bz2
+SLANG_CAT:=$(BZCAT)
SLANG_SITE:=http://www.uclibc.org/
SLANG_DIR=$(BUILD_DIR)/slang-1.4.5-mini
ifeq ($(BR2_LARGEFILE),y)
@@ -15,7 +16,7 @@ $(DL_DIR)/$(SLANG_SOURCE):
$(WGET) -P $(DL_DIR) $(SLANG_SITE)/$(SLANG_SOURCE)
$(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE)
- bzcat $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(SLANG_CAT) $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(SLANG_DIR)/libslang.so: $(SLANG_DIR)
$(MAKE1) CFLAGS="-Os -g $(SLANG_CFLAGS)" CC=$(TARGET_CC) -C $(SLANG_DIR)
diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index cbb3dfd429..77e68c84fe 100644
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -10,6 +10,7 @@ SOCAT_VERSION=1.4.0.3
# what you are doing! Danger, Danger!
SOCAT_SOURCE=socat-$(SOCAT_VERSION).tar.bz2
+SOCAT_CAT:=$(BZCAT)
SOCAT_SITE=http://www.dest-unreach.org/socat/download/
#SOCAT_DIR=$(BUILD_DIR)/${shell basename $(SOCAT_SOURCE) .tar.bz2}
SOCAT_DIR=$(BUILD_DIR)/socat-1.4
@@ -20,7 +21,7 @@ $(DL_DIR)/$(SOCAT_SOURCE):
$(WGET) -P $(DL_DIR) $(SOCAT_SITE)/$(SOCAT_SOURCE)
$(SOCAT_DIR)/.unpacked: $(DL_DIR)/$(SOCAT_SOURCE)
- bzip2 -d -c $(DL_DIR)/$(SOCAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(SOCAT_CAT) $(DL_DIR)/$(SOCAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(SOCAT_DIR)/.unpacked
$(SOCAT_WORKDIR)/Makefile: $(SOCAT_DIR)/.unpacked
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 1c5f4383fb..f4e8dfb9f2 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -6,7 +6,7 @@
STRACE_VER:=4.5.14
STRACE_SOURCE:=strace-$(STRACE_VER).tar.bz2
STRACE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/strace
-STRACE_CAT:=bzcat
+STRACE_CAT:=$(BZCAT)
STRACE_DIR:=$(BUILD_DIR)/strace-$(STRACE_VER)
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index 0535b52599..754d04c03a 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -7,7 +7,7 @@ GNUTAR_VER:=1.15.1
GNUTAR_SOURCE:=tar-$(GNUTAR_VER).tar.bz2
GNUTAR_SITE:=http://ftp.gnu.org/gnu/tar/
GNUTAR_DIR:=$(BUILD_DIR)/tar-$(GNUTAR_VER)
-GNUTAR_CAT:=bzcat
+GNUTAR_CAT:=$(BZCAT)
GNUTAR_BINARY:=src/tar
GNUTAR_TARGET_BINARY:=bin/tar
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index a3eba754b3..be11ae0451 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -7,7 +7,7 @@ TFTP_HPA_VER:=0.40
TFTP_HPA_SOURCE:=tftp-hpa-$(TFTP_HPA_VER).tar.bz2
TFTP_HPA_SITE:=http://www.kernel.org/pub/software/network/tftp/
TFTP_HPA_DIR:=$(BUILD_DIR)/tftp-hpa-$(TFTP_HPA_VER)
-TFTP_HPA_CAT:=bzcat
+TFTP_HPA_CAT:=$(BZCAT)
TFTP_HPA_BINARY:=tftpd/tftpd
TFTP_HPA_TARGET_BINARY:=usr/sbin/in.tftpd
diff --git a/package/tinylogin/tinylogin.mk b/package/tinylogin/tinylogin.mk
index 29514db036..73d3857118 100644
--- a/package/tinylogin/tinylogin.mk
+++ b/package/tinylogin/tinylogin.mk
@@ -16,6 +16,7 @@ TINYLOGIN_DIR:=$(BUILD_DIR)/tinylogin-1.4
TINYLOGIN_SOURCE:=tinylogin-1.4.tar.bz2
TINYLOGIN_SITE:=http://tinylogin.busybox.net/downloads
endif
+TINYLOGIN_CAT:=$(BZCAT)
$(DL_DIR)/$(TINYLOGIN_SOURCE):
$(WGET) -P $(DL_DIR) $(TINYLOGIN_SITE)/$(TINYLOGIN_SOURCE)
@@ -23,7 +24,7 @@ $(DL_DIR)/$(TINYLOGIN_SOURCE):
tinylogin-source: $(DL_DIR)/$(TINYLOGIN_SOURCE)
$(TINYLOGIN_DIR)/Config.h: $(DL_DIR)/$(TINYLOGIN_SOURCE)
- bzcat $(DL_DIR)/$(TINYLOGIN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(TINYLOGIN_CAT) $(DL_DIR)/$(TINYLOGIN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(SED) "s/\`id -u\` -ne 0/0 == 1/" \
$(TINYLOGIN_DIR)/install.sh
$(SED) "s/4755 --owner=root --group=root/755/" \
diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk
index 81e8801d4a..063aab039f 100644
--- a/package/tinyx/tinyx.mk
+++ b/package/tinyx/tinyx.mk
@@ -55,7 +55,7 @@ TINYX_CF:=$(TINYX_DIR)/config/cf
#
# Some things that you may want to change.
TINYX_XFBDEV:=$(TINYX_DIR)/programs/Xserver/Xfbdev
-TINYX_CAT:=bzcat
+TINYX_CAT:=$(BZCAT)
TINYX_BINX:=$(TARGET_DIR)/usr/X11R6/bin/
TINYX_LIBX:=$(TARGET_DIR)/usr/lib/
diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk
index 7ebe40d924..8477bebbf7 100644
--- a/package/tn5250/tn5250.mk
+++ b/package/tn5250/tn5250.mk
@@ -1,12 +1,13 @@
TN5250_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tn5250
TN5250_DIR:=$(BUILD_DIR)/tn5250-0.16.4
TN5250_SOURCE:=tn5250-0.16.4.tar.gz
+TN5250_CAT:=$(ZCAT)
$(DL_DIR)/$(TN5250_SOURCE):
$(WGET) -P $(DL_DIR) $(TN5250_SITE)/$(TN5250_SOURCE)
$(TN5250_DIR)/.dist: $(DL_DIR)/$(TN5250_SOURCE)
- gunzip -c $(DL_DIR)/$(TN5250_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(TN5250_CAT) $(DL_DIR)/$(TN5250_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-touch $(TN5250_DIR)/.dist
$(TN5250_DIR)/.configured: $(TN5250_DIR)/.dist
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 2d3f32a5ea..80bf159cd7 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -6,7 +6,7 @@
UDEV_VERSION:=094
UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
UDEV_SITE:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
-UDEV_CAT:=bzcat
+UDEV_CAT:=$(BZCAT)
UDEV_DIR:=$(BUILD_DIR)/udev-$(UDEV_VERSION)
UDEV_TARGET_BINARY:=sbin/udev
UDEV_BINARY:=udev
diff --git a/package/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index 5d477d75bf..e28034dc05 100644
--- a/package/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -5,6 +5,7 @@
#############################################################
UEMACS_VER:=4.0.15-lt
UEMACS_SOURCE:=em-$(UEMACS_VER).tar.bz2
+UEMACS_CAT:=$(BZCAT)
UEMACS_SITE:=ftp://ftp.kernel.org/pub/software/editors/uemacs/
UEMACS_DIR:=$(BUILD_DIR)/em-$(UEMACS_VER)
UEMACS_BINARY:=em
@@ -16,7 +17,7 @@ $(DL_DIR)/$(UEMACS_SOURCE):
uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
$(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE)
- bzcat $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
touch $(UEMACS_DIR)/.unpacked
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index 494fd0d69e..45774f1489 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -7,7 +7,7 @@ UTIL-LINUX_VER:=2.12r
UTIL-LINUX_SOURCE:=util-linux-$(UTIL-LINUX_VER).tar.bz2
UTIL-LINUX_SITE:=http://www.kernel.org/pub/linux/utils/util-linux
UTIL-LINUX_DIR:=$(BUILD_DIR)/util-linux-$(UTIL-LINUX_VER)
-UTIL-LINUX_CAT:=bzcat
+UTIL-LINUX_CAT:=$(BZCAT)
UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/mcookie
UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/mcookie
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 9b0ae29fe2..a147dc6644 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -8,12 +8,13 @@ VALGRIND_VERSION=3.2.1
VALGRIND_SITE:=http://valgrind.org/downloads/
VALGRIND_DIR:=$(BUILD_DIR)/valgrind-$(VALGRIND_VERSION)
VALGRIND_SOURCE:=valgrind-$(VALGRIND_VERSION).tar.bz2
+VALGRIND_CAT:=$(BZCAT)
$(DL_DIR)/$(VALGRIND_SOURCE):
$(WGET) -P $(DL_DIR) $(VALGRIND_SITE)/$(VALGRIND_SOURCE)
$(VALGRIND_DIR)/.unpacked: $(DL_DIR)/$(VALGRIND_SOURCE)
- bzcat $(DL_DIR)/$(VALGRIND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(VALGRIND_CAT) $(DL_DIR)/$(VALGRIND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(VALGRIND_DIR)/.unpacked
$(VALGRIND_DIR)/.patched: $(VALGRIND_DIR)/.unpacked
diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
index 2dc3cd82b0..40b2c1c596 100644
--- a/package/xorg/xorg.mk
+++ b/package/xorg/xorg.mk
@@ -25,7 +25,7 @@ XORG_LIBS:= Xft fontconfig expat Xrender Xaw Xmu Xt \
#
XORG_SOURCE:=X11R6.8.2-src.tar.bz2
XORG_SITE:=http://xorg.freedesktop.org/X11R6.8.2/src-single/
-XORG_CAT:=bzcat
+XORG_CAT:=$(BZCAT)
XORG_DIR:=$(BUILD_DIR)/xc
XORG_LDIR:=$(XORG_DIR)/lib
XORG_PROGS:=$(XORG_DIR)/programs
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 3d82c51261..5560a3bdc7 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -5,6 +5,7 @@
#############################################################
ZLIB_VER:=1.2.3
ZLIB_SOURCE:=zlib-$(ZLIB_VER).tar.bz2
+ZLIB_CAT:=$(BZCAT)
ZLIB_SITE:=http://www.zlib.net/
ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VER)
ZLIB_CFLAGS:=$(TARGET_CFLAGS) -fPIC
@@ -16,7 +17,7 @@ $(DL_DIR)/$(ZLIB_SOURCE):
$(WGET) -P $(DL_DIR) $(ZLIB_SITE)/$(ZLIB_SOURCE)
$(ZLIB_DIR)/.source: $(DL_DIR)/$(ZLIB_SOURCE)
- bzcat $(DL_DIR)/$(ZLIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(ZLIB_CAT) $(DL_DIR)/$(ZLIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(ZLIB_DIR) package/zlib/ zlib\*.patch
touch $(ZLIB_DIR)/.source
diff --git a/target/device/AMD/DBAu1500/linux.mk b/target/device/AMD/DBAu1500/linux.mk
index 4c12b3a65c..423191c0da 100644
--- a/target/device/AMD/DBAu1500/linux.mk
+++ b/target/device/AMD/DBAu1500/linux.mk
@@ -49,6 +49,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
LINUX_BINLOC=$(LINUX_FORMAT)
LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
+LINUX_CAT:=$(BZCAT)
LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.6
# Used by pcmcia-cs and others
LINUX_SOURCE_DIR=$(LINUX_DIR)
@@ -61,7 +62,7 @@ $(DL_DIR)/$(LINUX_SOURCE):
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-mkdir -p $(TOOL_BUILD_DIR)
-(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux)
- bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
# Rename the dir from the downloaded version to the AFTER patch version
mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-$(LINUX_VERSION)
diff --git a/target/device/Sharp/LNode80/linux.mk b/target/device/Sharp/LNode80/linux.mk
index 5410f48c38..55bfa28457 100644
--- a/target/device/Sharp/LNode80/linux.mk
+++ b/target/device/Sharp/LNode80/linux.mk
@@ -49,6 +49,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT)
LINUX_DIR=$(BUILD_DIR)/linux-lnode80
LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
+LINUX_CAT:=$(BZCAT)
LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4
# Used by pcmcia-cs and others
LINUX_SOURCE_DIR=$(LINUX_DIR)
@@ -61,7 +62,7 @@ $(DL_DIR)/$(LINUX_SOURCE):
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-mkdir -p $(TOOL_BUILD_DIR)
-(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux)
- bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
# Rename the dir from the downloaded version to the AFTER patch version
mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-lnode80
diff --git a/target/device/Soekris/net4521/linux.mk b/target/device/Soekris/net4521/linux.mk
index 7a552a39b5..a2db726650 100644
--- a/target/device/Soekris/net4521/linux.mk
+++ b/target/device/Soekris/net4521/linux.mk
@@ -50,6 +50,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT)
LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
+LINUX_CAT:=$(BZCAT)
LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4
# Used by pcmcia-cs and others
LINUX_SOURCE_DIR=$(LINUX_DIR)
@@ -62,7 +63,7 @@ $(DL_DIR)/$(LINUX_SOURCE):
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-mkdir -p $(TOOL_BUILD_DIR)
-(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux)
- bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
# Rename the dir from the downloaded version to the AFTER patch version
mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-$(LINUX_VERSION)
diff --git a/target/device/Soekris/net4801/linux.mk b/target/device/Soekris/net4801/linux.mk
index 58cb7040ab..1a23e64d61 100644
--- a/target/device/Soekris/net4801/linux.mk
+++ b/target/device/Soekris/net4801/linux.mk
@@ -50,6 +50,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT)
LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
+LINUX_CAT:=$(BZCAT)
LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4
# Used by pcmcia-cs and others
LINUX_SOURCE_DIR=$(LINUX_DIR)
@@ -62,7 +63,7 @@ $(DL_DIR)/$(LINUX_SOURCE):
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-mkdir -p $(TOOL_BUILD_DIR)
-(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux)
- bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
# Rename the dir from the downloaded version to the AFTER patch version
mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-$(LINUX_VERSION)
diff --git a/target/device/Via/epia-mii/linux.mk b/target/device/Via/epia-mii/linux.mk
index 6a246d543f..4856366572 100644
--- a/target/device/Via/epia-mii/linux.mk
+++ b/target/device/Via/epia-mii/linux.mk
@@ -37,6 +37,7 @@ LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT)
LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
+LINUX_CAT:=$(BZCAT)
LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.6
LINUX_KCONFIG=target/device/Via/epia-mii/linux.config
LINUX_KERNEL=$(BUILD_DIR)/buildroot-kernel
@@ -50,7 +51,7 @@ $(DL_DIR)/$(LINUX_SOURCE):
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-mkdir -p $(TOOL_BUILD_DIR)
-(cd $(TOOL_BUILD_DIR); ln -sf $(LINUX_DIR) linux)
- bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
# Rename the dir from the downloaded version to the AFTER patch version
mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-$(LINUX_VERSION)
diff --git a/target/device/jp/q5/linux.mk b/target/device/jp/q5/linux.mk
index ff28e04f7f..88a187b081 100644
--- a/target/device/jp/q5/linux.mk
+++ b/target/device/jp/q5/linux.mk
@@ -49,6 +49,7 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \
LINUX_BINLOC=$(LINUX_FORMAT)
LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION)
LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2
+LINUX_CAT:=$(BZCAT)
LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4
# Used by pcmcia-cs and others
LINUX_SOURCE_DIR=$(LINUX_DIR)
@@ -60,7 +61,7 @@ $(DL_DIR)/$(LINUX_SOURCE):
$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE)
-mkdir -p $(TOOL_BUILD_DIR)
-(cd $(TOOL_BUILD_DIR); ln -snf $(LINUX_DIR) linux)
- bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(LINUX_CAT) $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION))
# Rename the dir from the downloaded version to the AFTER patch version
mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-$(LINUX_VERSION)
diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk
index ff02219099..96dc6ba460 100644
--- a/target/iso9660/iso9660.mk
+++ b/target/iso9660/iso9660.mk
@@ -4,6 +4,7 @@
#
#############################################################
MKISOFS_SOURCE:=cdrtools-2.01.tar.bz2
+MKISOFS_CAT:=$(BZCAT)
MKISOFS_SITE:=ftp://ftp.berlios.de/pub/cdrecord/
MKISOFS_DIR:=$(BUILD_DIR)/cdrtools-2.01
MKISOFS_TARGET:=$(MKISOFS_DIR)/mkisofs/OBJ/i686-linux-cc/mkisofs
@@ -14,7 +15,7 @@ $(DL_DIR)/$(MKISOFS_SOURCE):
mkisofs-source: $(DL_DIR)/$(MKISOFS_SOURCE)
$(MKISOFS_DIR)/.unpacked: $(DL_DIR)/$(MKISOFS_SOURCE)
- bzcat $(DL_DIR)/$(MKISOFS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ $(MKISOFS_CAT) $(DL_DIR)/$(MKISOFS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(MKISOFS_DIR) target/iso9660/ \*.patch
touch $(MKISOFS_DIR)/.unpacked
diff --git a/target/x86/syslinux/syslinux.mk b/target/x86/syslinux/syslinux.mk
index a11d27701d..e3b5ce2ba3 100644
--- a/target/x86/syslinux/syslinux.mk
+++ b/target/x86/syslinux/syslinux.mk
@@ -9,6 +9,7 @@ SYSLINUX_VERSION:=3.31
SYSLINUX_DIR=$(BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
SYSLINUX_DIR2=$(TOOL_BUILD_DIR)/syslinux-$(SYSLINUX_VERSION)
SYSLINUX_SOURCE=syslinux-$(SYSLINUX_VERSION).tar.bz2
+SYSLINUX_CAT:=$(BZCAT)
SYSLINUX_SITE=http://www.kernel.org/pub/linux/utils/boot/syslinux
SYSLINUX_BIN=$(SYSLINUX_DIR2)/mtools/syslinux
@@ -17,7 +18,7 @@ $(DL_DIR)/$(SYSLINUX_SOURCE):
$(WGET) -P $(DL_DIR) $(SYSLINUX_SITE)/$(SYSLINUX_SOURCE)
$(SYSLINUX_DIR)/Makefile: $(DL_DIR)/$(SYSLINUX_SOURCE) $(SYSLINUX_PATCH)
- bzcat $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+ $(SYSLINUX_CAT) $(DL_DIR)/$(SYSLINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf -
toolchain/patch-kernel.sh $(SYSLINUX_DIR) target/x86/syslinux/ \*.patch
touch -c $(SYSLINUX_DIR)/Makefile
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index 2df68bd0fe..98e08597d6 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 258a335bd6..31c5d4b5fc 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 e75a236426..366cbed989 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 afad596ebb..f73a677942 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 f2933d4538..ca1e49a6bd 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