Commit a1726117 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'for-2010.11/download-rework' of git://git.busybox.net/~tpetazzoni/git/buildroot 



Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parents 0a5ec788 14753844

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 
	Old-style package hooks (*_HOOK_POST_*) removed. Use the more

	generic new-style ones instead.



	Download handling reworked and support for git/svn downloads

	added.



	Updated/fixed packages: alsa-lib, at, avahi, berkeleydb, bind,

	bmon, bridge-utils, busybox, dbus, dmraid, docker, dropbear,

	e2fsprogs, expat, freetype, gawk, gvfs, haserl, hostapd,

Config.in

+8 −16
Original line number Diff line number Diff line
@@ -21,25 +21,17 @@ config BR2_WGET 
	string "Wget command"

	default "wget --passive-ftp -nd"



config BR2_SVN_CO

	string "Subversion (svn) command to download source tree"

	default "svn co"

config BR2_SVN

	string "Subversion (svn) command"

	default "svn"



config BR2_SVN_UP

	string "Subversion (svn) command to update source tree"

	default "svn up"



config BR2_BZR_CO

	string "Bazaar (bzr) command to download source tree"

	default "bzr co"



config BR2_BZR_UP

	string "Bazaar (bzr) command to update source tree"

	default "bzr up"

config BR2_BZR

	string "Bazaar (bzr) command"

	default "bzr"



config BR2_GIT

	string "Git command to download source tree"

	default "git clone"

	string "Git command"

	default "git"



config BR2_ZCAT

	string "zcat command"

Makefile

+2 −14
Original line number Diff line number Diff line
@@ -244,21 +244,10 @@ ifeq ($(ARCH),xtensa) 
ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name))

endif



WGET:=$(call qstrip,$(BR2_WGET)) $(SPIDER) $(QUIET)

SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET)

SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET)

BZR_CO:=$(call qstrip,$(BR2_BZR_CO)) $(QUIET)

BZR_UP:=$(call qstrip,$(BR2_BZR_UP)) $(QUIET)

GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)

ZCAT:=$(call qstrip,$(BR2_ZCAT))

BZCAT:=$(call qstrip,$(BR2_BZCAT))

TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf



DL_DIR=$(call qstrip,$(BR2_DL_DIR))

ifeq ($(DL_DIR),)

DL_DIR:=$(TOPDIR)/dl

endif



GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX))



STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR))
@@ -437,11 +426,10 @@ endif 
source: $(TARGETS_SOURCE) $(HOST_SOURCE)



_source-check:

	$(MAKE) $(EXTRAMAKEARGS) SPIDER=--spider source

	$(MAKE) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source



external-deps:

	@$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \

		$(EXTRAMAKEARGS) SPIDER=--spider source

	@$(MAKE) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source



show-targets:

	@echo $(TARGETS)

configs/arm_toolchain_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -131,9 +131,8 @@ BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6" 
# Build options

#

BR2_WGET="wget --passive-ftp -nd"

BR2_SVN_CO="svn co"

BR2_SVN_UP="svn up"

BR2_GIT="git clone"

BR2_SVN="svn"

BR2_GIT="git"

BR2_ZCAT="gzip -d -c"

BR2_BZCAT="bzcat"

BR2_TAR_OPTIONS=""

configs/at91rm9200df_defconfig

+2 −3
Original line number Diff line number Diff line
@@ -136,9 +136,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER 
# Build options

#

BR2_WGET="wget --passive-ftp -nd"

BR2_SVN_CO="svn co"

BR2_SVN_UP="svn up"

BR2_GIT="git clone"

BR2_SVN="svn"

BR2_GIT="git"

BR2_ZCAT="gzip -d -c"

BR2_BZCAT="bzcat"

BR2_TAR_OPTIONS=""