Commit 6e2823c1 authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- add and use BR2_BZCAT config option.

parent b9cc4a53

Config.in

+11 −1
Original line number Diff line number Diff line
@@ -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"

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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) \

package/Makefile.in

+15 −7
Original line number Diff line number Diff line
@@ -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 \

package/autoconf/autoconf.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

package/automake/automake.mk

+1 −1
Original line number Diff line number Diff line
@@ -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