diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-16 11:42:52 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-01-16 11:42:52 +0000 |
| commit | 4a7bfd27757e076837e400f18d8371d792eade0e (patch) | |
| tree | 3521b2b1562ad6532bc1ba8c83568b2365bc0f9a /package | |
| parent | d58636d7658f5f5455f417b1ad81ed0dab361d56 (diff) | |
| download | buildroot-novena-4a7bfd27757e076837e400f18d8371d792eade0e.tar.gz buildroot-novena-4a7bfd27757e076837e400f18d8371d792eade0e.zip | |
package/: convert to DOWNLOAD helper
Diffstat (limited to 'package')
227 files changed, 280 insertions, 280 deletions
diff --git a/package/acpid/acpid.mk b/package/acpid/acpid.mk index bc8cb8282..cbd625795 100644 --- a/package/acpid/acpid.mk +++ b/package/acpid/acpid.mk @@ -9,7 +9,7 @@ ACPID_SOURCE=acpid_$(ACPID_VERSION).orig.tar.gz ACPID_SITE=$(BR2_DEBIAN_MIRROR)/debian/pool/main/a/acpid $(DL_DIR)/$(ACPID_SOURCE): - $(WGET) -P $(DL_DIR) $(ACPID_SITE)/$(ACPID_SOURCE) + $(call DOWNLOAD,$(ACPID_SITE),$(ACPID_SOURCE)) $(ACPID_DIR)/.unpacked: $(DL_DIR)/$(ACPID_SOURCE) $(ZCAT) $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/package/argus/argus.mk b/package/argus/argus.mk index c57c543fc..e1c85415f 100644 --- a/package/argus/argus.mk +++ b/package/argus/argus.mk @@ -13,10 +13,10 @@ ARGUS_BINARY:=bin/argus ARGUS_TARGET_BINARY:=usr/sbin/argus $(DL_DIR)/$(ARGUS_SOURCE): - $(WGET) -P $(DL_DIR) $(ARGUS_SITE)/$(ARGUS_SOURCE) + $(call DOWNLOAD,$(ARGUS_SITE),$(ARGUS_SOURCE)) $(DL_DIR)/$(ARGUS_PATCH): - $(WGET) -P $(DL_DIR) $(ARGUS_SITE)/$(ARGUS_PATCH) + $(call DOWNLOAD,$(ARGUS_SITE),$(ARGUS_PATCH)) argus-source: $(DL_DIR)/$(ARGUS_SOURCE) $(DL_DIR)/$(ARGUS_PATCH) diff --git a/package/at/at.mk b/package/at/at.mk index 441bb25f6..73d58a216 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -12,7 +12,7 @@ AT_TARGET_SCRIPT:=etc/init.d/S99at AT_BINARY:=at $(DL_DIR)/$(AT_SOURCE): - $(WGET) -P $(DL_DIR) $(AT_SITE)/$(AT_SOURCE) + $(call DOWNLOAD,$(AT_SITE),$(AT_SOURCE)) at-source: $(DL_DIR)/$(AT_SOURCE) diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk index ce7db66aa..8ee685283 100644 --- a/package/autoconf/autoconf.mk +++ b/package/autoconf/autoconf.mk @@ -18,7 +18,7 @@ AUTOCONF:=$(STAGING_DIR)/usr/bin/autoconf AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" autoreconf -v -f -i -I "$(ACLOCAL_DIR)" $(DL_DIR)/$(AUTOCONF_SOURCE): - $(WGET) -P $(DL_DIR) $(AUTOCONF_SITE)/$(AUTOCONF_SOURCE) + $(call DOWNLOAD,$(AUTOCONF_SITE),$(AUTOCONF_SOURCE)) autoconf-source: $(DL_DIR)/$(AUTOCONF_SOURCE) diff --git a/package/automake/automake.mk b/package/automake/automake.mk index 7924e8f5e..86f9ee15b 100644 --- a/package/automake/automake.mk +++ b/package/automake/automake.mk @@ -19,7 +19,7 @@ ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal ACLOCAL = aclocal -I $(ACLOCAL_DIR) $(DL_DIR)/$(AUTOMAKE_SOURCE): - $(WGET) -P $(DL_DIR) $(AUTOMAKE_SITE)/$(AUTOMAKE_SOURCE) + $(call DOWNLOAD,$(AUTOMAKE_SITE),$(AUTOMAKE_SOURCE)) automake-source: $(DL_DIR)/$(AUTOMAKE_SOURCE) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index 0b656932b..f44ef1f3d 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -43,7 +43,7 @@ AVAHI_DISABLE_DBUS:=--disable-dbus endif $(DL_DIR)/$(AVAHI_SOURCE): - $(WGET) -P $(DL_DIR) $(AVAHI_SITE)/$(AVAHI_SOURCE) + $(call DOWNLOAD,$(AVAHI_SITE),$(AVAHI_SOURCE)) avahi-source: $(DL_DIR)/$(AVAHI_SOURCE) diff --git a/package/axel/axel.mk b/package/axel/axel.mk index fb153866b..ecd512c04 100644 --- a/package/axel/axel.mk +++ b/package/axel/axel.mk @@ -12,7 +12,7 @@ AXEL_BINARY:=axel AXEL_TARGET_BINARY:=usr/bin/axel $(DL_DIR)/$(AXEL_SOURCE): - $(WGET) -P $(DL_DIR) $(AXEL_SITE)/$(AXEL_SOURCE) + $(call DOWNLOAD,$(AXEL_SITE),$(AXEL_SOURCE)) axel-source: $(DL_DIR)/$(AXEL_SOURCE) diff --git a/package/bash/bash.mk b/package/bash/bash.mk index b0a51bcbc..6eb2848a9 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -12,7 +12,7 @@ BASH_BINARY:=bash BASH_TARGET_BINARY:=bin/bash $(DL_DIR)/$(BASH_SOURCE): - $(WGET) -P $(DL_DIR) $(BASH_SITE)/$(BASH_SOURCE) + $(call DOWNLOAD,$(BASH_SITE),$(BASH_SOURCE)) bash-source: $(DL_DIR)/$(BASH_SOURCE) diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk index d42a822ab..a6e043974 100644 --- a/package/berkeleydb/berkeleydb.mk +++ b/package/berkeleydb/berkeleydb.mk @@ -11,7 +11,7 @@ DB_DIR:=$(BUILD_DIR)/db-$(DB_VERSION).NC DB_SHARLIB:=libdb-$(DB_SO_VERSION).so $(DL_DIR)/$(DB_SOURCE): - $(WGET) -P $(DL_DIR) $(DB_SITE)/$(DB_SOURCE) + $(call DOWNLOAD,$(DB_SITE),$(DB_SOURCE)) berkeleydb-source: $(DL_DIR)/$(DB_SOURCE) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index ff9630134..15efc1bd6 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -13,7 +13,7 @@ BIND_BINARY:=bin/named/named BIND_TARGET_BINARY:=usr/sbin/named $(DL_DIR)/$(BIND_SOURCE): - $(WGET) -P $(DL_DIR) $(BIND_SITE)/$(BIND_SOURCE) + $(call DOWNLOAD,$(BIND_SITE),$(BIND_SOURCE)) bind-source: $(DL_DIR)/$(BIND_SOURCE) diff --git a/package/bison/bison.mk b/package/bison/bison.mk index f46af1b7c..1bac12084 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -12,7 +12,7 @@ BISON_BINARY:=src/bison BISON_TARGET_BINARY:=usr/bin/bison $(DL_DIR)/$(BISON_SOURCE): - $(WGET) -P $(DL_DIR) $(BISON_SITE)/$(BISON_SOURCE) + $(call DOWNLOAD,$(BISON_SITE),$(BISON_SOURCE)) bison-source: $(DL_DIR)/$(BISON_SOURCE) diff --git a/package/boa/boa.mk b/package/boa/boa.mk index 3c09e9ba1..d0531b1f8 100644 --- a/package/boa/boa.mk +++ b/package/boa/boa.mk @@ -16,7 +16,7 @@ BOA_DIR=$(BUILD_DIR)/${shell basename $(BOA_SOURCE) .tar.gz} BOA_WORKDIR=$(BUILD_DIR)/boa_workdir $(DL_DIR)/$(BOA_SOURCE): - $(WGET) -P $(DL_DIR) $(BOA_SITE)/$(BOA_SOURCE) + $(call DOWNLOAD,$(BOA_SITE),$(BOA_SOURCE)) $(BOA_DIR)/.unpacked: $(DL_DIR)/$(BOA_SOURCE) $(BOA_CAT) $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk index 1881a9a4a..ad72f70e1 100644 --- a/package/bsdiff/bsdiff.mk +++ b/package/bsdiff/bsdiff.mk @@ -12,7 +12,7 @@ BSDIFF_TARGET_BINARY:=usr/bin/bsdiff BSDIFF_ZCAT=$(ZCAT) $(DL_DIR)/$(BSDIFF_SOURCE): - $(WGET) -P $(DL_DIR) $(BSDIFF_SITE)/$(BSDIFF_SOURCE) + $(call DOWNLOAD,$(BSDIFF_SITE),$(BSDIFF_SOURCE)) $(BSDIFF_DIR)/.source: $(DL_DIR)/$(BSDIFF_SOURCE) $(BSDIFF_ZCAT) $(DL_DIR)/$(BSDIFF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index dd120a881..85aed550b 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -26,7 +26,7 @@ BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG))) endif $(DL_DIR)/$(BUSYBOX_SOURCE): - $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE) + $(call DOWNLOAD,$(BUSYBOX_SITE),$(BUSYBOX_SOURCE)) $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index a4599c33d..d3f00fd85 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -12,7 +12,7 @@ BZIP2_BINARY:=$(BZIP2_DIR)/bzip2 BZIP2_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/bzmore $(DL_DIR)/$(BZIP2_SOURCE): - $(WGET) -P $(DL_DIR) $(BZIP2_SITE)/$(BZIP2_SOURCE) + $(call DOWNLOAD,$(BZIP2_SITE),$(BZIP2_SOURCE)) bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE) diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk index 04e4ff6f2..31de2d5b8 100644 --- a/package/coreutils/coreutils.mk +++ b/package/coreutils/coreutils.mk @@ -15,7 +15,7 @@ BIN_PROGS:=cat chgrp chmod chown cp date dd df dir echo false hostname \ ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true uname $(DL_DIR)/$(COREUTILS_SOURCE): - $(WGET) -P $(DL_DIR) $(COREUTILS_SITE)/$(COREUTILS_SOURCE) + $(call DOWNLOAD,$(COREUTILS_SITE),$(COREUTILS_SOURCE)) coreutils-source: $(DL_DIR)/$(COREUTILS_SOURCE) diff --git a/package/cups/cups.mk b/package/cups/cups.mk index bd1e7a699..ce48c6509 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -23,7 +23,7 @@ ifneq ($(BR2_PACKAGE_XSERVER_none),y) endif $(DL_DIR)/$(CUPS_SOURCE): - $(WGET) -P $(DL_DIR) $(CUPS_SITE)/$(CUPS_SOURCE) + $(call DOWNLOAD,$(CUPS_SITE),$(CUPS_SOURCE)) $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE) $(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 310a3253e..601aa96f6 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -23,12 +23,12 @@ CVS_CONFIGURE_ARGS+=--with-external-zlib endif $(DL_DIR)/$(CVS_SOURCE): - $(WGET) -P $(DL_DIR) $(CVS_SITE)/$(CVS_SOURCE) + $(call DOWNLOAD,$(CVS_SITE),$(CVS_SOURCE)) ifneq ($(CVS_PATCH),) CVS_PATCH_FILE=$(DL_DIR)/$(CVS_PATCH) $(CVS_PATCH_FILE): - $(WGET) -P $(DL_DIR) $(CVS_SITE)/$(CVS_PATCH) + $(call DOWNLOAD,$(CVS_SITE),$(CVS_PATCH)) endif cvs-source: $(DL_DIR)/$(CVS_SOURCE) $(CVS_PATCH_FILE) diff --git a/package/dash/dash.mk b/package/dash/dash.mk index a66be0c70..932fe9490 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -13,10 +13,10 @@ DASH_BINARY:=src/dash DASH_TARGET_BINARY:=bin/dash $(DL_DIR)/$(DASH_SOURCE): - $(WGET) -P $(DL_DIR) $(DASH_SITE)/$(DASH_SOURCE) + $(call DOWNLOAD,$(DASH_SITE),$(DASH_SOURCE)) $(DL_DIR)/$(DASH_PATCH1): - $(WGET) -P $(DL_DIR) $(DASH_SITE)/$(DASH_PATCH1) + $(call DOWNLOAD,$(DASH_SITE),$(DASH_PATCH1)) dash-source: $(DL_DIR)/$(DASH_SOURCE) $(DL_DIR)/$(DASH_PATCH1) diff --git a/package/database/sqlite/sqlite.mk b/package/database/sqlite/sqlite.mk index 039d16039..b24e0e0fe 100644 --- a/package/database/sqlite/sqlite.mk +++ b/package/database/sqlite/sqlite.mk @@ -11,7 +11,7 @@ SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION) SQLITE_CAT:=$(ZCAT) $(DL_DIR)/$(SQLITE_SOURCE): - $(WGET) -P $(DL_DIR) $(SQLITE_SITE)/$(SQLITE_SOURCE) + $(call DOWNLOAD,$(SQLITE_SITE),$(SQLITE_SOURCE)) $(SQLITE_DIR)/.unpacked: $(DL_DIR)/$(SQLITE_SOURCE) $(SQLITE_CAT) $(DL_DIR)/$(SQLITE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/dbus-glib/dbus-glib.mk b/package/dbus-glib/dbus-glib.mk index 8dcdad26d..5b80906b6 100644 --- a/package/dbus-glib/dbus-glib.mk +++ b/package/dbus-glib/dbus-glib.mk @@ -12,7 +12,7 @@ DBUS_GLIB_BINARY:=dbus/.libs/dbus-binding-tool DBUS_GLIB_TARGET_BINARY:=usr/bin/dbus-binding-tool $(DL_DIR)/$(DBUS_GLIB_SOURCE): - $(WGET) -P $(DL_DIR) $(DBUS_GLIB_SITE)/$(DBUS_GLIB_SOURCE) + $(call DOWNLOAD,$(DBUS_GLIB_SITE),$(DBUS_GLIB_SOURCE)) dbus-glib-source: $(DL_DIR)/$(DBUS_GLIB_SOURCE) diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 3c772d2c0..9cc8edb6f 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -24,7 +24,7 @@ DBUS_XML_DEP:=libxml2-install-staging endif $(DL_DIR)/$(DBUS_SOURCE): - $(WGET) -P $(DL_DIR) $(DBUS_SITE)/$(DBUS_SOURCE) + $(call DOWNLOAD,$(DBUS_SITE),$(DBUS_SOURCE)) dbus-source: $(DL_DIR)/$(DBUS_SOURCE) diff --git a/package/devmem2/devmem2.mk b/package/devmem2/devmem2.mk index 1ccd4808e..04fc77cb9 100644 --- a/package/devmem2/devmem2.mk +++ b/package/devmem2/devmem2.mk @@ -10,7 +10,7 @@ DEVMEM2_BINARY:=devmem2 DEVMEM2_DIR:=$(BUILD_DIR)/devmem2 $(DL_DIR)/$(DEVMEM2_SOURCE): - $(WGET) -P $(DL_DIR) $(DEVMEM2_SITE)/$(DEVMEM2_SOURCE) + $(call DOWNLOAD,$(DEVMEM2_SITE),$(DEVMEM2_SOURCE)) $(DEVMEM2_DIR)/$(DEVMEM2_SOURCE): $(DL_DIR)/$(DEVMEM2_SOURCE) mkdir -p $(@D) diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk index 903e7cb02..a18b7b454 100644 --- a/package/dhcp/dhcp.mk +++ b/package/dhcp/dhcp.mk @@ -19,7 +19,7 @@ BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \ VARDB=/var/lib/dhcp $(DL_DIR)/$(DHCP_SOURCE): - $(WGET) -P $(DL_DIR) $(DHCP_SITE)/$(DHCP_SOURCE) + $(call DOWNLOAD,$(DHCP_SITE),$(DHCP_SOURCE)) dhcp-source: $(DL_DIR)/$(DHCP_SOURCE) diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk index 3c9f99d80..005a1bb54 100644 --- a/package/dialog/dialog.mk +++ b/package/dialog/dialog.mk @@ -11,7 +11,7 @@ DIALOG_BINARY:=dialog DIALOG_TARGET_BINARY:=usr/bin/dialog $(DL_DIR)/$(DIALOG_SOURCE): - $(WGET) -P $(DL_DIR) $(DIALOG_SITE)/$(DIALOG_SOURCE) + $(call DOWNLOAD,$(DIALOG_SITE),$(DIALOG_SOURCE)) $(DIALOG_DIR)/.source: $(DL_DIR)/$(DIALOG_SOURCE) $(ZCAT) $(DL_DIR)/$(DIALOG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index 93075a078..1911f912f 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -12,7 +12,7 @@ DIFFUTILS_BINARY:=src/diff DIFFUTILS_TARGET_BINARY:=usr/bin/diff $(DL_DIR)/$(DIFFUTILS_SOURCE): - $(WGET) -P $(DL_DIR) $(DIFFUTILS_SITE)/$(DIFFUTILS_SOURCE) + $(call DOWNLOAD,$(DIFFUTILS_SITE),$(DIFFUTILS_SOURCE)) diffutils-source: $(DL_DIR)/$(DIFFUTILS_SOURCE) diff --git a/package/dillo/dillo.mk b/package/dillo/dillo.mk index 190c6428b..12d9a5ce1 100644 --- a/package/dillo/dillo.mk +++ b/package/dillo/dillo.mk @@ -11,7 +11,7 @@ DILLO_DIR=$(BUILD_DIR)/dillo-$(DILLO_VERSION) DILLO_CAT:=$(BZCAT) $(DL_DIR)/$(DILLO_SOURCE): - $(WGET) -P $(DL_DIR) $(DILLO_SITE)/$(DILLO_SOURCE) + $(call DOWNLOAD,$(DILLO_SITE),$(DILLO_SOURCE)) $(DILLO_DIR)/.unpacked: $(DL_DIR)/$(DILLO_SOURCE) $(DILLO_CAT) $(DL_DIR)/$(DILLO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index f14eba97c..03c74dec6 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -106,7 +106,7 @@ DIRECTFB_JPEG:=--disable-jpeg endif $(DL_DIR)/$(DIRECTFB_SOURCE): - $(WGET) -P $(DL_DIR) $(DIRECTFB_SITE)/$(DIRECTFB_SOURCE) + $(call DOWNLOAD,$(DIRECTFB_SITE),$(DIRECTFB_SOURCE)) directfb-source: $(DL_DIR)/$(DIRECTFB_SOURCE) diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 6b9b52d3d..59e298f2a 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -12,7 +12,7 @@ DISTCC_BINARY:=distcc DISTCC_TARGET_BINARY:=usr/bin/distcc $(DL_DIR)/$(DISTCC_SOURCE): - $(WGET) -P $(DL_DIR) $(DISTCC_SITE)/$(DISTCC_SOURCE) + $(call DOWNLOAD,$(DISTCC_SITE),$(DISTCC_SOURCE)) distcc-source: $(DL_DIR)/$(CVS_SOURCE) diff --git a/package/dm/dm.mk b/package/dm/dm.mk index a6a7e559b..c30bee322 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -38,8 +38,8 @@ DM_TARGET_LIBRARY:=$(TARGET_DIR)/usr/lib/libdevmapper.so DM_TARGET_HEADER:=$(TARGET_DIR)/usr/include/libdevmapper.h $(DL_DIR)/$(DM_SOURCE): - $(WGET) -P $(DL_DIR) $(DM_SITE)/$(DM_SOURCE) || \ - $(WGET) -P $(DL_DIR) $(DM_SITE_OLD)/$(DM_SOURCE) + $(call DOWNLOAD,$(DM_SITE),$(DM_SOURCE) || \) + $(call DOWNLOAD,$(DM_SITE_OLD),$(DM_SOURCE)) dm-source: $(DL_DIR)/$(DM_SOURCE) diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk index 4589cdda8..164d9da26 100644 --- a/package/dmalloc/dmalloc.mk +++ b/package/dmalloc/dmalloc.mk @@ -12,7 +12,7 @@ DMALLOC_BINARY:=dmalloc DMALLOC_TARGET_BINARY:=usr/bin/dmalloc $(DL_DIR)/$(DMALLOC_SOURCE): - $(WGET) -P $(DL_DIR) $(DMALLOC_SITE)/$(DMALLOC_SOURCE) + $(call DOWNLOAD,$(DMALLOC_SITE),$(DMALLOC_SOURCE)) dmalloc-source: $(DL_DIR)/$(DMALLOC_SOURCE) diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 53a8561cf..7db7d8448 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -14,7 +14,7 @@ DMRAID_STAGING_BINARY:=$(DMRAID_DIR)/STAGING_DIR)/tools/$(DMRAID_BINARY) DMRAID_TARGET_BINARY:=$(TARGET_DIR)/sbin/$(DMRAID_BINARY) $(DL_DIR)/$(DMRAID_SOURCE): - $(WGET) -P $(DL_DIR) $(DMRAID_SITE)/$(DMRAID_SOURCE) + $(call DOWNLOAD,$(DMRAID_SITE),$(DMRAID_SOURCE)) dmraid-source: $(DL_DIR)/$(DMRAID_SOURCE) diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 150d7a045..1060c08bd 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -32,7 +32,7 @@ DNSMASQ_DBUS:= endif $(DL_DIR)/$(DNSMASQ_SOURCE): - $(WGET) -P $(DL_DIR) $(DNSMASQ_SITE)/$(DNSMASQ_SOURCE) + $(call DOWNLOAD,$(DNSMASQ_SITE),$(DNSMASQ_SOURCE)) $(DNSMASQ_DIR)/.source: $(DL_DIR)/$(DNSMASQ_SOURCE) $(ZCAT) $(DL_DIR)/$(DNSMASQ_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 672a7f3da..5fa775ac5 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -12,7 +12,7 @@ DROPBEAR_BINARY:=dropbearmulti DROPBEAR_TARGET_BINARY:=usr/sbin/dropbear $(DL_DIR)/$(DROPBEAR_SOURCE): - $(WGET) -P $(DL_DIR) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE) + $(call DOWNLOAD,$(DROPBEAR_SITE),$(DROPBEAR_SOURCE)) dropbear-source: $(DL_DIR)/$(DROPBEAR_SOURCE) diff --git a/package/dummy/dummy.mk b/package/dummy/dummy.mk index f8c535088..3eb5f0bb4 100644 --- a/package/dummy/dummy.mk +++ b/package/dummy/dummy.mk @@ -21,7 +21,7 @@ DUMMY_TARGET_BINARY:=usr/bin/$(DUMMY_BINARY) # The download rule. Main purpose is to download the source package. $(DL_DIR)/$(DUMMY_SOURCE): - $(WGET) -P $(DL_DIR) $(DUMMY_SITE)/$(DUMMY_SOURCE) + $(call DOWNLOAD,$(DUMMY_SITE),$(DUMMY_SOURCE)) # The unpacking rule. Main purpose is to extract the source package, apply any # patches and update config.guess and config.sub. diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 091a94729..25d4d1a9d 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -16,7 +16,7 @@ E2FSPROGS_MISC_STRIP:= \ lsattr mke2fs mklost+found tune2fs uuidgen $(DL_DIR)/$(E2FSPROGS_SOURCE): - $(WGET) -P $(DL_DIR) $(E2FSPROGS_SITE)/$(E2FSPROGS_SOURCE) + $(call DOWNLOAD,$(E2FSPROGS_SITE),$(E2FSPROGS_SOURCE)) e2fsprogs-source: $(DL_DIR)/$(E2FSPROGS_SOURCE) diff --git a/package/editors/nano/nano.mk b/package/editors/nano/nano.mk index fc417360d..15cc5991c 100644 --- a/package/editors/nano/nano.mk +++ b/package/editors/nano/nano.mk @@ -12,7 +12,7 @@ NANO_BINARY:=src/nano NANO_TARGET_BINARY:=usr/bin/nano $(DL_DIR)/$(NANO_SOURCE): - $(WGET) -P $(DL_DIR) $(NANO_SITE)/$(NANO_SOURCE) + $(call DOWNLOAD,$(NANO_SITE),$(NANO_SOURCE)) nano-source: $(DL_DIR)/$(NANO_SOURCE) diff --git a/package/editors/uemacs/uemacs.mk b/package/editors/uemacs/uemacs.mk index 2e845d492..51a37bc92 100644 --- a/package/editors/uemacs/uemacs.mk +++ b/package/editors/uemacs/uemacs.mk @@ -12,7 +12,7 @@ UEMACS_BINARY:=em UEMACS_TARGET_BINARY:=usr/bin/emacs $(DL_DIR)/$(UEMACS_SOURCE): - $(WGET) -P $(DL_DIR) $(UEMACS_SITE)/$(UEMACS_SOURCE) + $(call DOWNLOAD,$(UEMACS_SITE),$(UEMACS_SOURCE)) uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE) diff --git a/package/editors/vim/vim.mk b/package/editors/vim/vim.mk index fe82ac325..9bf3d4816 100644 --- a/package/editors/vim/vim.mk +++ b/package/editors/vim/vim.mk @@ -14,10 +14,10 @@ VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk $(DL_DIR)/$(VIM_SOURCE): - $(WGET) -P $(DL_DIR) $(VIM_SOURCE_SITE)/$(VIM_SOURCE) + $(call DOWNLOAD,$(VIM_SOURCE_SITE),$(VIM_SOURCE)) $(DL_DIR)/vim/%: - $(WGET) -P $(DL_DIR)/vim/ $(VIM_PATCH_SITE)/$* + $(call DOWNLOAD,$(VIM_PATCH_SITE),$*) vim-source: $(DL_DIR)/$(VIM_SOURCE) $(VIM_PATCHES) diff --git a/package/eeprog/eeprog.mk b/package/eeprog/eeprog.mk index 5773c425d..98b9173da 100644 --- a/package/eeprog/eeprog.mk +++ b/package/eeprog/eeprog.mk @@ -11,7 +11,7 @@ EEPROG_BINARY:=eeprog EEPROG_TARGET_BINARY:=usr/sbin/eeprog $(DL_DIR)/$(EEPROG_SOURCE): - $(WGET) -P $(DL_DIR) $(EEPROG_SITE)/$(EEPROG_SOURCE) + $(call DOWNLOAD,$(EEPROG_SITE),$(EEPROG_SOURCE)) eeprog-source: $(DL_DIR)/$(EEPROG_SOURCE) diff --git a/package/expat/expat.mk b/package/expat/expat.mk index fc7e0599d..e98b578dd 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -14,7 +14,7 @@ EXPAT_BINARY:=.libs/libexpat.a EXPAT_TARGET_BINARY:=usr/lib/libexpat.so.1 $(DL_DIR)/$(EXPAT_SOURCE): - $(WGET) -P $(DL_DIR) $(EXPAT_SITE)/$(EXPAT_SOURCE) + $(call DOWNLOAD,$(EXPAT_SITE),$(EXPAT_SOURCE)) expat-source: $(DL_DIR)/$(EXPAT_SOURCE) diff --git a/package/ezxml/ezxml.mk b/package/ezxml/ezxml.mk index c9e855e12..7f9c0e698 100644 --- a/package/ezxml/ezxml.mk +++ b/package/ezxml/ezxml.mk @@ -10,7 +10,7 @@ EZXML_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ezxm EZXML_DIR:=$(BUILD_DIR)/ezxml $(DL_DIR)/$(EZXML_SOURCE): - $(WGET) -P $(DL_DIR) $(EZXML_SITE)/$(EZXML_SOURCE) + $(call DOWNLOAD,$(EZXML_SITE),$(EZXML_SOURCE)) $(EZXML_DIR)/.unpacked: $(DL_DIR)/$(EZXML_SOURCE) $(ZCAT) $(DL_DIR)/$(EZXML_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index 020ad8828..7b1d739c6 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -12,7 +12,7 @@ FAKEROOT_DIR1:=$(TOOL_BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-target $(DL_DIR)/$(FAKEROOT_SOURCE): - $(WGET) -P $(DL_DIR) $(FAKEROOT_SITE)/$(FAKEROOT_SOURCE) + $(call DOWNLOAD,$(FAKEROOT_SITE),$(FAKEROOT_SOURCE)) fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE) diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk index 5c51bcd76..008e5644f 100644 --- a/package/fbset/fbset.mk +++ b/package/fbset/fbset.mk @@ -12,7 +12,7 @@ FBSET_BINARY:=fbset FBSET_TARGET_BINARY:=usr/sbin/$(FBSET_BINARY) $(DL_DIR)/$(FBSET_SOURCE): - $(WGET) -P $(DL_DIR) $(FBSET_SITE)/$(FBSET_SOURCE) + $(call DOWNLOAD,$(FBSET_SITE),$(FBSET_SOURCE)) $(FBSET_DIR)/.unpacked: $(DL_DIR)/$(FBSET_SOURCE) $(FBSET_CAT) $(DL_DIR)/$(FBSET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/fbv/fbv.mk b/package/fbv/fbv.mk index f76194a79..8b4d296f8 100644 --- a/package/fbv/fbv.mk +++ b/package/fbv/fbv.mk @@ -12,7 +12,7 @@ FBV_BINARY:=fbv FBV_TARGET_BINARY:=usr/bin/$(FBV_BINARY) $(DL_DIR)/$(FBV_SOURCE): - $(WGET) -P $(DL_DIR) $(FBV_SITE)/$(FBV_SOURCE) + $(call DOWNLOAD,$(FBV_SITE),$(FBV_SOURCE)) fbv-source: $(DL_DIR)/$(FBV_SOURCE) diff --git a/package/fconfig/fconfig.mk b/package/fconfig/fconfig.mk index ffab1395c..e4eb15036 100644 --- a/package/fconfig/fconfig.mk +++ b/package/fconfig/fconfig.mk @@ -12,7 +12,7 @@ FCONFIG_BINARY:=fconfig FCONFIG_TARGET_BINARY:=sbin/fconfig $(DL_DIR)/$(FCONFIG_SOURCE): - $(WGET) -P $(DL_DIR) $(FCONFIG_SITE)/$(FCONFIG_SOURCE) + $(call DOWNLOAD,$(FCONFIG_SITE),$(FCONFIG_SOURCE)) fconfig-source: $(DL_DIR)/$(FCONFIG_SOURCE) diff --git a/package/file/file.mk b/package/file/file.mk index 0ff1d1590..e285f5261 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -14,7 +14,7 @@ FILE_BINARY:=src/file FILE_TARGET_BINARY:=usr/bin/file $(DL_DIR)/$(FILE_SOURCE): - $(WGET) -P $(DL_DIR) $(FILE_SITE)/$(FILE_SOURCE) + $(call DOWNLOAD,$(FILE_SITE),$(FILE_SOURCE)) file-source: $(DL_DIR)/$(FILE_SOURCE) diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk index 046e492d9..3dd16ca19 100644 --- a/package/findutils/findutils.mk +++ b/package/findutils/findutils.mk @@ -13,7 +13,7 @@ FINDUTILS_BINARY:=find/find FINDUTILS_TARGET_BINARY:=usr/bin/find $(DL_DIR)/$(FINDUTILS_SOURCE): - $(WGET) -P $(DL_DIR) $(FINDUTILS_SITE)/$(FINDUTILS_SOURCE) + $(call DOWNLOAD,$(FINDUTILS_SITE),$(FINDUTILS_SOURCE)) findutils-source: $(DL_DIR)/$(FINDUTILS_SOURCE) diff --git a/package/fis/fis.mk b/package/fis/fis.mk index 62ea3842f..4a7e7164d 100644 --- a/package/fis/fis.mk +++ b/package/fis/fis.mk @@ -11,7 +11,7 @@ FIS_BINARY:=fis FIS_TARGET_BINARY:=sbin/fis $(DL_DIR)/$(FIS_SOURCE): - $(WGET) -P $(DL_DIR) $(FIS_SITE)/$(FIS_SOURCE) + $(call DOWNLOAD,$(FIS_SITE),$(FIS_SOURCE)) fis-source: $(DL_DIR)/$(FIS_SOURCE) diff --git a/package/flex/flex.mk b/package/flex/flex.mk index 0063e85e2..08c17d096 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -14,10 +14,10 @@ FLEX_BINARY:=flex FLEX_TARGET_BINARY:=usr/bin/flex $(DL_DIR)/$(FLEX_SOURCE): - $(WGET) -P $(DL_DIR) $(FLEX_SITE)/$(FLEX_SOURCE) + $(call DOWNLOAD,$(FLEX_SITE),$(FLEX_SOURCE)) $(DL_DIR)/$(FLEX_PATCH): - $(WGET) -P $(DL_DIR) $(FLEX_SITE)/$(FLEX_PATCH) + $(call DOWNLOAD,$(FLEX_SITE),$(FLEX_PATCH)) flex-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH) diff --git a/package/fuse/libfuse.mk b/package/fuse/libfuse.mk index 77c378197..5dcb20a4a 100644 --- a/package/fuse/libfuse.mk +++ b/package/fuse/libfuse.mk @@ -9,7 +9,7 @@ LIBFUSE_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fu LIBFUSE_DIR:=$(BUILD_DIR)/fuse-$(LIBFUSE_VERSION) LIBFUSE_BINARY:=libfuse $(DL_DIR)/$(LIBFUSE_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBFUSE_SITE)/$(LIBFUSE_SOURCE) + $(call DOWNLOAD,$(LIBFUSE_SITE),$(LIBFUSE_SOURCE)) $(LIBFUSE_DIR)/.source: $(DL_DIR)/$(LIBFUSE_SOURCE) $(ZCAT) $(DL_DIR)/$(LIBFUSE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/gadgetfs-test/gadgetfs-test.mk b/package/gadgetfs-test/gadgetfs-test.mk index 5bdd67ed2..201f6fe6a 100644 --- a/package/gadgetfs-test/gadgetfs-test.mk +++ b/package/gadgetfs-test/gadgetfs-test.mk @@ -14,7 +14,7 @@ GADGETFS_TEST_MAKEOPTS+=USE_AIO=y endif $(DL_DIR)/$(GADGETFS_TEST_SOURCE): - $(WGET) -P $(DL_DIR) $(GADGETFS_TEST_SITE)/$(GADGETFS_TEST_SOURCE) + $(call DOWNLOAD,$(GADGETFS_TEST_SITE),$(GADGETFS_TEST_SOURCE)) $(GADGETFS_TEST_DIR)/.unpacked: $(DL_DIR)/$(GADGETFS_TEST_SOURCE) $(BZCAT) $(DL_DIR)/$(GADGETFS_TEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/games/doom-wad/doom-wads.mk b/package/games/doom-wad/doom-wads.mk index 29c89ffcc..bae242091 100644 --- a/package/games/doom-wad/doom-wads.mk +++ b/package/games/doom-wad/doom-wads.mk @@ -10,7 +10,7 @@ DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom/ DOOM_WAD_DIR=$(BUILD_DIR)/doom-wad-$(DOOM_WAD_VERSION) $(DL_DIR)/$(DOOM_WAD_SOURCE): - $(WGET) -P $(DL_DIR) $(DOOM_WAD_SITE)/$(DOOM_WAD_SOURCE) + $(call DOWNLOAD,$(DOOM_WAD_SITE),$(DOOM_WAD_SOURCE)) doom-wad-source: $(DL_DIR)/$(DOOM_WAD_SOURCE) diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk index 66effec71..1f8e67804 100644 --- a/package/gawk/gawk.mk +++ b/package/gawk/gawk.mk @@ -12,7 +12,7 @@ GAWK_BINARY:=gawk GAWK_TARGET_BINARY:=usr/bin/gawk $(DL_DIR)/$(GAWK_SOURCE): - $(WGET) -P $(DL_DIR) $(GAWK_SITE)/$(GAWK_SOURCE) + $(call DOWNLOAD,$(GAWK_SITE),$(GAWK_SOURCE)) gawk-source: $(DL_DIR)/$(GAWK_SOURCE) diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index dd7f75a3a..2a0c33305 100644 --- a/package/gettext/gettext.mk +++ b/package/gettext/gettext.mk @@ -18,7 +18,7 @@ LIBINTL_TARGET_BINARY:=usr/lib/libintl.so endif $(DL_DIR)/$(GETTEXT_SOURCE): - $(WGET) -P $(DL_DIR) $(GETTEXT_SITE)/$(GETTEXT_SOURCE) + $(call DOWNLOAD,$(GETTEXT_SITE),$(GETTEXT_SOURCE)) gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 9712cc3fb..111f6068c 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -20,7 +20,7 @@ GMP_CPP_FLAGS:=CPPFLAGS=-DDLL_EXPORT endif $(DL_DIR)/$(GMP_SOURCE): - $(WGET) -P $(DL_DIR) $(GMP_SITE)/$(GMP_SOURCE) + $(call DOWNLOAD,$(GMP_SITE),$(GMP_SOURCE)) libgmp-source: $(DL_DIR)/$(GMP_SOURCE) diff --git a/package/gtk2-engines/gtk2-engines.mk b/package/gtk2-engines/gtk2-engines.mk index e54c63f53..30467a046 100644 --- a/package/gtk2-engines/gtk2-engines.mk +++ b/package/gtk2-engines/gtk2-engines.mk @@ -74,7 +74,7 @@ GTK2_ENGINES_BUILD_ENV= \ $(DL_DIR)/$(GTK2_ENGINES_SOURCE): - $(WGET) -P $(DL_DIR) $(GTK2_ENGINES_SITE)/$(GTK2_ENGINES_SOURCE) + $(call DOWNLOAD,$(GTK2_ENGINES_SITE),$(GTK2_ENGINES_SOURCE)) gtk2-engines-source: $(DL_DIR)/$(GTK2_ENGINES_SOURCE) diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk index f61e48b2e..beffe9d2e 100644 --- a/package/gzip/gzip.mk +++ b/package/gzip/gzip.mk @@ -12,7 +12,7 @@ GZIP_BINARY:=$(GZIP_DIR)/gzip GZIP_TARGET_BINARY:=$(TARGET_DIR)/bin/zmore $(DL_DIR)/$(GZIP_SOURCE): - $(WGET) -P $(DL_DIR) $(GZIP_SITE)/$(GZIP_SOURCE) + $(call DOWNLOAD,$(GZIP_SITE),$(GZIP_SOURCE)) gzip-source: $(DL_DIR)/$(GZIP_SOURCE) diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 6a0229008..3ea77587d 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -20,7 +20,7 @@ GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so \ DBUS_GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libdbus-glib-1.so $(DL_DIR)/$(HAL_SOURCE): - $(WGET) -P $(DL_DIR) $(HAL_SITE)/$(HAL_SOURCE) + $(call DOWNLOAD,$(HAL_SITE),$(HAL_SOURCE)) hal-source: $(DL_DIR)/$(HAL_SOURCE) diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk index be22d438b..59d964f12 100644 --- a/package/hdparm/hdparm.mk +++ b/package/hdparm/hdparm.mk @@ -12,7 +12,7 @@ HDPARM_BINARY:=hdparm HDPARM_TARGET_BINARY:=sbin/hdparm $(DL_DIR)/$(HDPARM_SOURCE): - $(WGET) -P $(DL_DIR) $(HDPARM_SITE)/$(HDPARM_SOURCE) + $(call DOWNLOAD,$(HDPARM_SITE),$(HDPARM_SOURCE)) hdparm-source: $(DL_DIR)/$(HDPARM_SOURCE) diff --git a/package/hostap/hostap.mk b/package/hostap/hostap.mk index 35363919e..d0af5fd1d 100644 --- a/package/hostap/hostap.mk +++ b/package/hostap/hostap.mk @@ -15,7 +15,7 @@ HOSTAP_SITE=http://hostap.epitest.fi/releases HOSTAP_DIR=$(BUILD_DIR)/hostapd-$(HOSTAP_VERSION) $(DL_DIR)/$(HOSTAP_SOURCE): - $(WGET) -P $(DL_DIR) $(HOSTAP_SITE)/$(HOSTAP_SOURCE) + $(call DOWNLOAD,$(HOSTAP_SITE),$(HOSTAP_SOURCE)) hostap-source: $(DL_DIR)/$(HOSTAP_SOURCE) diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 8d2cfc743..72c5d2640 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -13,10 +13,10 @@ HWDATA_BINARY:=pci.ids HWDATA_TARGET_BINARY:=usr/share/hwdata/pci.ids $(DL_DIR)/$(HWDATA_SOURCE): - $(WGET) -P $(DL_DIR) $(HWDATA_SITE)/$(HWDATA_SOURCE) + $(call DOWNLOAD,$(HWDATA_SITE),$(HWDATA_SOURCE)) $(DL_DIR)/$(HWDATA_PATCH): - $(WGET) -P $(DL_DIR) $(HWDATA_SITE)/$(HWDATA_PATCH) + $(call DOWNLOAD,$(HWDATA_SITE),$(HWDATA_PATCH)) hwdata-source: $(DL_DIR)/$(HWDATA_SOURCE) $(DL_DIR)/$(HWDATA_PATCH) diff --git a/package/i2c-tools/i2c-tools.mk b/package/i2c-tools/i2c-tools.mk index 18958bb9c..bd96d9d80 100644 --- a/package/i2c-tools/i2c-tools.mk +++ b/package/i2c-tools/i2c-tools.mk @@ -11,7 +11,7 @@ I2C_TOOLS_BINARY:=tools/i2cdetect I2C_TOOLS_TARGET_BINARY:=usr/bin/i2cdetect $(DL_DIR)/$(I2C_TOOLS_SOURCE): - $(WGET) -P $(DL_DIR) $(I2C_TOOLS_SITE)/$(I2C_TOOLS_SOURCE) + $(call DOWNLOAD,$(I2C_TOOLS_SITE),$(I2C_TOOLS_SOURCE)) $(I2C_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(I2C_TOOLS_SOURCE) $(BZCAT) $(DL_DIR)/$(I2C_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/icu/icu.mk b/package/icu/icu.mk index dedc77563..525663aee 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -12,7 +12,7 @@ ICU_DIR:=$(BUILD_DIR)/icu/source ICU_HOST_DIR:=$(BUILD_DIR)/icu-host/source $(DL_DIR)/$(ICU_SOURCE): - $(WGET) -P $(DL_DIR) $(ICU_SITE)/$(ICU_SOURCE) + $(call DOWNLOAD,$(ICU_SITE),$(ICU_SOURCE)) icu-source: $(DL_DIR)/$(ICU_SOURCE) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 5748c8f20..3c142a861 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -24,7 +24,7 @@ IMAGEMAGICK_TARGET_BINARIES+=$(TARGET_DIR)/usr/bin/convert IMAGEMAGICK_COPY:=cp -df --preserve=mode,ownership $(DL_DIR)/$(IMAGEMAGICK_SOURCE): - $(WGET) -P $(DL_DIR) $(IMAGEMAGICK_SITE)/$(IMAGEMAGICK_SOURCE) + $(call DOWNLOAD,$(IMAGEMAGICK_SITE),$(IMAGEMAGICK_SOURCE)) $(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE) $(IMAGEMAGICK_CAT) $(DL_DIR)/$(IMAGEMAGICK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/input-tools/input-tools.mk b/package/input-tools/input-tools.mk index 8a64ef92e..020e1c9ed 100644 --- a/package/input-tools/input-tools.mk +++ b/package/input-tools/input-tools.mk @@ -23,10 +23,10 @@ INPUT_TOOLS_SOURCES := $(addprefix $(INPUT_TOOLS_DIR)/utils/, \ $(addsuffix .c, $(INPUT_TOOLS_TARGETS-y))) $(DL_DIR)/$(INPUT_TOOLS_SOURCE): - $(WGET) -P $(DL_DIR) $(INPUT_TOOLS_SITE)/$(@F) + $(call DOWNLOAD,$(INPUT_TOOLS_SITE),$(@F)) $(DL_DIR)/$(INPUT_TOOLS_PATCH): - $(WGET) -P $(DL_DIR) $(INPUT_TOOLS_SITE)/$(@F) + $(call DOWNLOAD,$(INPUT_TOOLS_SITE),$(@F)) $(INPUT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(INPUT_TOOLS_SOURCE) $(DL_DIR)/$(INPUT_TOOLS_PATCH) $(INPUT_TOOLS_CAT) $(DL_DIR)/$(INPUT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/iostat/iostat.mk b/package/iostat/iostat.mk index c8e5b8ccb..d692d7f41 100644 --- a/package/iostat/iostat.mk +++ b/package/iostat/iostat.mk @@ -11,7 +11,7 @@ IOSTAT_BINARY:=iostat IOSTAT_TARGET_BINARY:=usr/bin/iostat $(DL_DIR)/$(IOSTAT_SOURCE): - $(WGET) -P $(DL_DIR) $(IOSTAT_SITE)/$(IOSTAT_SOURCE) + $(call DOWNLOAD,$(IOSTAT_SITE),$(IOSTAT_SOURCE)) iostat-source: $(DL_DIR)/$(IOSTAT_SOURCE) diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index f44ee576e..3ced6125a 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -13,7 +13,7 @@ IPROUTE2_BINARY:=tc/tc IPROUTE2_TARGET_BINARY:=sbin/tc $(DL_DIR)/$(IPROUTE2_SOURCE): - $(WGET) -P $(DL_DIR) $(IPROUTE2_SITE)$(IPROUTE2_SOURCE) + $(call DOWNLOAD,$(IPROUTE2_SITE)$(IPROUTE2_SOURCE)) iproute2-source: $(DL_DIR)/$(IPROUTE2_SOURCE) diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index 7611abb9e..2f67385c6 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -59,7 +59,7 @@ IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline endif $(DL_DIR)/$(IPSEC_TOOLS_SOURCE): - $(WGET) -P $(DL_DIR) $(IPSEC_TOOLS_SITE)/$(IPSEC_TOOLS_SOURCE) + $(call DOWNLOAD,$(IPSEC_TOOLS_SITE),$(IPSEC_TOOLS_SOURCE)) $(IPSEC_TOOLS_DIR)/.patched: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) $(IPSEC_TOOLS_CAT) $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/java/concierge/concierge.mk b/package/java/concierge/concierge.mk index a03ac6128..8a40eb845 100644 --- a/package/java/concierge/concierge.mk +++ b/package/java/concierge/concierge.mk @@ -11,10 +11,10 @@ CONCIERGE_SITE_BUNDLES = http://concierge.sourceforge.net/bundles/ $(DL_DIR)/concierge: mkdir -p $(DL_DIR)/concierge/ - $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE)/concierge-$(CONCIERGE_VERSION).jar - $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar - $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar - $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar + $(call DOWNLOAD,$(CONCIERGE_SITE),concierge-$(CONCIERGE_VERSION).jar) + $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar) + $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar) + $(call DOWNLOAD,$(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar) $(TARGET_DIR)/usr/lib/concierge/: $(DL_DIR)/concierge mkdir -p $(TARGET_DIR)/usr/lib diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk index 9899d93cd..bb1c55b28 100644 --- a/package/jpeg/jpeg.mk +++ b/package/jpeg/jpeg.mk @@ -27,7 +27,7 @@ JPEG_SOURCE=jpegsrc.v$(JPEG_VERSION).tar.gz JPEG_CAT:=$(ZCAT) $(DL_DIR)/$(JPEG_SOURCE): - $(WGET) -P $(DL_DIR) $(JPEG_SITE)/$(JPEG_SOURCE) + $(call DOWNLOAD,$(JPEG_SITE),$(JPEG_SOURCE)) jpeg-source: $(DL_DIR)/$(JPEG_SOURCE) diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index 031681161..2e99ac2fe 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -24,10 +24,10 @@ KEXEC_CONFIG_OPTS += --without-zlib endif $(DL_DIR)/$(KEXEC_SOURCE): - $(WGET) -P $(DL_DIR) $(KEXEC_SITE)/$(KEXEC_SOURCE) + $(call DOWNLOAD,$(KEXEC_SITE),$(KEXEC_SOURCE)) $(DL_DIR)/$(KEXEC_PATCH): - $(WGET) -P $(DL_DIR) $(KEXEC_SITE)/$(KEXEC_PATCH) + $(call DOWNLOAD,$(KEXEC_SITE),$(KEXEC_PATCH)) kexec-source: $(DL_DIR)/$(KEXEC_SOURCE) $(DL_DIR)/$(KEXEC_PATCH) diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index b9d6a26c6..918801c9b 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -12,7 +12,7 @@ KISMET_BINARY:=kismet KISMET_TARGET_DIRECTORY=usr/bin/ $(DL_DIR)/$(KISMET_SOURCE): - $(WGET) -P $(DL_DIR) $(KISMET_SITE)/$(KISMET_SOURCE) + $(call DOWNLOAD,$(KISMET_SITE),$(KISMET_SOURCE)) kismet-source: $(DL_DIR)/$(KISMET_SOURCE) diff --git a/package/l2tp/l2tp.mk b/package/l2tp/l2tp.mk index fc1fd88b1..b4c1f3855 100644 --- a/package/l2tp/l2tp.mk +++ b/package/l2tp/l2tp.mk @@ -13,10 +13,10 @@ L2TP_BINARY:=l2tpd L2TP_TARGET_BINARY:=usr/sbin/l2tpd $(DL_DIR)/$(L2TP_SOURCE): - $(WGET) -P $(DL_DIR) $(L2TP_SITE)/$(L2TP_SOURCE) + $(call DOWNLOAD,$(L2TP_SITE),$(L2TP_SOURCE)) $(DL_DIR)/$(L2TP_PATCH): - $(WGET) -P $(DL_DIR) $(L2TP_SITE)/$(L2TP_PATCH) + $(call DOWNLOAD,$(L2TP_SITE),$(L2TP_PATCH)) l2tp-source: $(DL_DIR)/$(L2TP_SOURCE) $(DL_DIR)/$(L2TP_PATCH) diff --git a/package/less/less.mk b/package/less/less.mk index 4cf08391a..9b9b9c1a6 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -11,7 +11,7 @@ LESS_BINARY:=less LESS_TARGET_BINARY:=usr/bin/less $(DL_DIR)/$(LESS_SOURCE): - $(WGET) -P $(DL_DIR) $(LESS_SITE)/$(LESS_SOURCE) + $(call DOWNLOAD,$(LESS_SITE),$(LESS_SOURCE)) $(LESS_DIR)/.source: $(DL_DIR)/$(LESS_SOURCE) $(ZCAT) $(DL_DIR)/$(LESS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libaio/libaio.mk b/package/libaio/libaio.mk index 73f316019..52cd475f2 100644 --- a/package/libaio/libaio.mk +++ b/package/libaio/libaio.mk @@ -13,7 +13,7 @@ LIBAIO_ARCH:=$(ARCH) LIBAIO_MAKEOPTS:= $(TARGET_CONFIGURE_OPTS) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) -nostdlib -nostartfiles -I. -fPIC" LDFLAGS="$(TARGET_LDFLAGS)" $(DL_DIR)/$(LIBAIO_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBAIO_SITE)/$(LIBAIO_SOURCE) + $(call DOWNLOAD,$(LIBAIO_SITE),$(LIBAIO_SOURCE)) $(LIBAIO_DIR)/.unpacked: $(DL_DIR)/$(LIBAIO_SOURCE) $(BZCAT) $(DL_DIR)/$(LIBAIO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index 593b70816..32f9c3928 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -12,7 +12,7 @@ LIBCGI_DESTDIR:=usr/lib LIBCGI_TARGET_LIBRARY=$(LIBCGI_DESTDIR)/libcgi.so $(DL_DIR)/$(LIBCGI_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBCGI_SITE)/$(LIBCGI_SOURCE) + $(call DOWNLOAD,$(LIBCGI_SITE),$(LIBCGI_SOURCE)) $(LIBCGI_DIR)/.source: $(DL_DIR)/$(LIBCGI_SOURCE) $(ZCAT) $(DL_DIR)/$(LIBCGI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libcgicc/libcgicc.mk b/package/libcgicc/libcgicc.mk index c9ce404ef..02c864ab3 100644 --- a/package/libcgicc/libcgicc.mk +++ b/package/libcgicc/libcgicc.mk @@ -11,7 +11,7 @@ LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz LIBCGICC_CAT:=$(ZCAT) $(DL_DIR)/$(LIBCGICC_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBCGICC_SITE)/$(LIBCGICC_SOURCE) + $(call DOWNLOAD,$(LIBCGICC_SITE),$(LIBCGICC_SOURCE)) libcgicc-source: $(DL_DIR)/$(LIBCGICC_SOURCE) diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 43e41a1ac..672c148a0 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -10,7 +10,7 @@ LIBDRM_CAT:=$(BZCAT) LIBDRM_DIR:=$(BUILD_DIR)/libdrm-$(LIBDRM_VERSION) $(DL_DIR)/$(LIBDRM_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBDRM_SITE)/$(LIBDRM_SOURCE) + $(call DOWNLOAD,$(LIBDRM_SITE),$(LIBDRM_SOURCE)) libdrm-source: $(DL_DIR)/$(LIBDRM_SOURCE) diff --git a/package/libeXosip2/libeXosip2.mk b/package/libeXosip2/libeXosip2.mk index c9c3c82c9..1ac62dfd5 100644 --- a/package/libeXosip2/libeXosip2.mk +++ b/package/libeXosip2/libeXosip2.mk @@ -11,7 +11,7 @@ LIBEXOSIP2_DIR=$(BUILD_DIR)/libeXosip2-$(LIBEXOSIP2_VERSION) LIBEXOSIP2_CAT:=$(ZCAT) $(DL_DIR)/$(LIBEXOSIP2_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBEXOSIP2_SITE)/$(LIBEXOSIP2_SOURCE) + $(call DOWNLOAD,$(LIBEXOSIP2_SITE),$(LIBEXOSIP2_SOURCE)) $(LIBEXOSIP2_DIR)/.unpacked: $(DL_DIR)/$(LIBEXOSIP2_SOURCE) $(LIBEXOSIP2_CAT) $(DL_DIR)/$(LIBEXOSIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk index 0b8165c8c..21fe03671 100644 --- a/package/libelf/libelf.mk +++ b/package/libelf/libelf.mk @@ -18,7 +18,7 @@ LIBELF_CONFIG:=--enable-elf64 endif $(DL_DIR)/$(LIBELF_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBELF_SITE)/$(LIBELF_SOURCE) + $(call DOWNLOAD,$(LIBELF_SITE),$(LIBELF_SOURCE)) $(LIBELF_DIR)/.unpacked: $(DL_DIR)/$(LIBELF_SOURCE) $(ZCAT) $(DL_DIR)/$(LIBELF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk index b5fb29c81..bfeaf9357 100644 --- a/package/liberation/liberation.mk +++ b/package/liberation/liberation.mk @@ -10,7 +10,7 @@ LIBERATION_DIR = $(BUILD_DIR)/liberation-fonts-$(LIBERATION_VERSION) LIBERATION_CAT:=$(ZCAT) $(DL_DIR)/$(LIBERATION_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBERATION_SITE)/$(LIBERATION_SOURCE) + $(call DOWNLOAD,$(LIBERATION_SITE),$(LIBERATION_SOURCE)) liberation-source: $(DL_DIR)/$(LIBERATION_SOURCE) diff --git a/package/libevent/libevent.mk b/package/libevent/libevent.mk index e31c0709d..049a2abe4 100644 --- a/package/libevent/libevent.mk +++ b/package/libevent/libevent.mk @@ -12,7 +12,7 @@ LIBEVENT_BINARY:=libevent.la LIBEVENT_TARGET_BINARY:=usr/lib/libevent.so $(DL_DIR)/$(LIBEVENT_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBEVENT_SITE)/$(LIBEVENT_SOURCE) + $(call DOWNLOAD,$(LIBEVENT_SITE),$(LIBEVENT_SOURCE)) libevent-source: $(DL_DIR)/$(LIBEVENT_SOURCE) diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk index d7a9c80eb..8efc9351a 100644 --- a/package/libfloat/libfloat.mk +++ b/package/libfloat/libfloat.mk @@ -19,10 +19,10 @@ endif endif $(DL_DIR)/$(LIBFLOAT_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBFLOAT_SITE)/$(LIBFLOAT_SOURCE) + $(call DOWNLOAD,$(LIBFLOAT_SITE),$(LIBFLOAT_SOURCE)) $(DL_DIR)/$(LIBFLOAT_PATCH): - $(WGET) -P $(DL_DIR) $(LIBFLOAT_SITE)/$(LIBFLOAT_PATCH) + $(call DOWNLOAD,$(LIBFLOAT_SITE),$(LIBFLOAT_PATCH)) libfloat-source: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PATCH) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index d7a608ebf..9df5bdede 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -12,7 +12,7 @@ LIBGCRYPT_DESTDIR:=usr/lib LIBGCRYPT_TARGET_LIBRARY=$(LIBGCRYPT_DESTDIR)/libgcrypt.so $(DL_DIR)/$(LIBGCRYPT_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBGCRYPT_SITE)/$(LIBGCRYPT_SOURCE) + $(call DOWNLOAD,$(LIBGCRYPT_SITE),$(LIBGCRYPT_SOURCE)) $(LIBGCRYPT_DIR)/.source: $(DL_DIR)/$(LIBGCRYPT_SOURCE) $(BZCAT) $(DL_DIR)/$(LIBGCRYPT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index 7e9c7dfe4..5fb30c1db 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -11,7 +11,7 @@ LIBGLIB12_DIR:=$(BUILD_DIR)/glib-$(LIBGLIB12_VERSION) LIBGLIB12_BINARY:=libglib.a $(DL_DIR)/$(LIBGLIB12_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBGLIB12_SITE)/$(LIBGLIB12_SOURCE) + $(call DOWNLOAD,$(LIBGLIB12_SITE),$(LIBGLIB12_SOURCE)) $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index a893cd9b9..ede4fc444 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -12,7 +12,7 @@ LIBGPG_ERROR_DESTDIR:=usr/lib LIBGPG_ERROR_TARGET_LIBRARY=$(LIBGPG_ERROR_DESTDIR)/libgpg-error.so $(DL_DIR)/$(LIBGPG_ERROR_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBGPG_ERROR_SITE)/$(LIBGPG_ERROR_SOURCE) + $(call DOWNLOAD,$(LIBGPG_ERROR_SITE),$(LIBGPG_ERROR_SOURCE)) $(LIBGPG_ERROR_DIR)/.source: $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) $(BZCAT) $(DL_DIR)/$(LIBGPG_ERROR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libgtk12/libgtk12.mk b/package/libgtk12/libgtk12.mk index f2d5f1088..a578ae8ae 100644 --- a/package/libgtk12/libgtk12.mk +++ b/package/libgtk12/libgtk12.mk @@ -12,7 +12,7 @@ LIBGTK12_BINARY:=libgtk.a $(DL_DIR)/$(LIBGTK12_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBGTK12_SITE)/$(LIBGTK12_SOURCE) + $(call DOWNLOAD,$(LIBGTK12_SITE),$(LIBGTK12_SOURCE)) libgtk12-source: $(DL_DIR)/$(LIBGTK12_SOURCE) diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk index a82dc32a1..a5e70ccf9 100644 --- a/package/liblockfile/liblockfile.mk +++ b/package/liblockfile/liblockfile.mk @@ -11,7 +11,7 @@ LIBLOCKFILE_DIR:=$(BUILD_DIR)/liblockfile-$(LIBLOCKFILE_VERSION) LIBLOCKFILE_BINARY:=liblockfile.so.1.0 $(DL_DIR)/$(LIBLOCKFILE_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBLOCKFILE_SITE)/$(LIBLOCKFILE_SOURCE) + $(call DOWNLOAD,$(LIBLOCKFILE_SITE),$(LIBLOCKFILE_SOURCE)) liblockfile-source: $(DL_DIR)/$(LIBLOCKFILE_SOURCE) diff --git a/package/libosip2/libosip2.mk b/package/libosip2/libosip2.mk index df97627b8..c8582fc44 100644 --- a/package/libosip2/libosip2.mk +++ b/package/libosip2/libosip2.mk @@ -11,7 +11,7 @@ LIBOSIP2_DIR=$(BUILD_DIR)/libosip2-$(LIBOSIP2_VERSION) LIBOSIP2_CAT:=$(ZCAT) $(DL_DIR)/$(LIBOSIP2_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBOSIP2_SITE)/$(LIBOSIP2_SOURCE) + $(call DOWNLOAD,$(LIBOSIP2_SITE),$(LIBOSIP2_SOURCE)) $(LIBOSIP2_DIR)/.unpacked: $(DL_DIR)/$(LIBOSIP2_SOURCE) $(LIBOSIP2_CAT) $(DL_DIR)/$(LIBOSIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 063e77ec0..3932d09d3 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -28,7 +28,7 @@ LIBPCAP_SOURCE:=libpcap-$(LIBPCAP_VERSION).tar.gz LIBPCAP_CAT:=$(ZCAT) $(DL_DIR)/$(LIBPCAP_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBPCAP_SITE)/$(LIBPCAP_SOURCE) + $(call DOWNLOAD,$(LIBPCAP_SITE),$(LIBPCAP_SOURCE)) libpcap-source: $(DL_DIR)/$(LIBPCAP_SOURCE) diff --git a/package/libraw1394/libraw1394.mk b/package/libraw1394/libraw1394.mk index 7f75e58af..e41d2916b 100644 --- a/package/libraw1394/libraw1394.mk +++ b/package/libraw1394/libraw1394.mk @@ -10,7 +10,7 @@ LIBRAW1394_SITE:=http://www.linux1394.org/dl LIBRAW1394_DIR:=$(BUILD_DIR)/libraw1394-$(LIBRAW1394_VERSION) $(DL_DIR)/$(LIBRAW1394_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBRAW1394_SITE)/$(LIBRAW1394_SOURCE) + $(call DOWNLOAD,$(LIBRAW1394_SITE),$(LIBRAW1394_SOURCE)) $(LIBRAW1394_DIR)/.unpacked: $(DL_DIR)/$(LIBRAW1394_SOURCE) $(ZCAT) $(DL_DIR)/$(LIBRAW1394_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/libsysfs/libsysfs.mk b/package/libsysfs/libsysfs.mk index 07f84b6f3..d02e8b78e 100644 --- a/package/libsysfs/libsysfs.mk +++ b/package/libsysfs/libsysfs.mk @@ -28,7 +28,7 @@ LIBSYSFS_SOURCE:=sysfsutils-$(LIBSYSFS_VERSION).tar.gz LIBSYSFS_CAT:=$(ZCAT) $(DL_DIR)/$(LIBSYSFS_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBSYSFS_SITE)/$(LIBSYSFS_SOURCE) + $(call DOWNLOAD,$(LIBSYSFS_SITE),$(LIBSYSFS_SOURCE)) libsysfs-source: $(DL_DIR)/$(LIBSYSFS_SOURCE) diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk index b70c1c391..9511b1327 100644 --- a/package/libtool/libtool.mk +++ b/package/libtool/libtool.mk @@ -15,7 +15,7 @@ LIBTOOL_TARGET_BINARY:=usr/bin/libtool LIBTOOL:=$(STAGING_DIR)/usr/bin/libtool $(DL_DIR)/$(LIBTOOL_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBTOOL_SITE)/$(LIBTOOL_SOURCE) + $(call DOWNLOAD,$(LIBTOOL_SITE),$(LIBTOOL_SOURCE)) libtool-source: $(DL_DIR)/$(LIBTOOL_SOURCE) diff --git a/package/libungif/libungif.mk b/package/libungif/libungif.mk index a5f794745..38d7f768f 100644 --- a/package/libungif/libungif.mk +++ b/package/libungif/libungif.mk @@ -12,7 +12,7 @@ LIBUNGIF_BINARY:=libungif.so.$(LIBUNGIF_VERSION) LIBUNGIF_TARGET_BINARY:=usr/lib/libungif.so $(DL_DIR)/$(LIBUNGIF_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBUNGIF_SITE)/$(LIBUNGIF_SOURCE) + $(call DOWNLOAD,$(LIBUNGIF_SITE),$(LIBUNGIF_SOURCE)) libungif-source: $(DL_DIR)/$(LIBUNGIF_SOURCE) diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 5f222942a..6a80d2671 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -14,10 +14,10 @@ LIBUSB_BINARY:=usr/lib/libusb.so ifneq ($(LIBUSB_PATCH_FILE),) LIBUSB_PATCH=$(DL_DIR)/$(LIBUSB_PATCH_FILE) $(LIBUSB_PATCH): - $(WGET) -P $(DL_DIR) $(LIBUSB_SITE)/$(LIBUSB_PATCH_FILE) + $(call DOWNLOAD,$(LIBUSB_SITE),$(LIBUSB_PATCH_FILE)) endif $(DL_DIR)/$(LIBUSB_SOURCE): $(LIBUSB_PATCH) - $(WGET) -P $(DL_DIR) $(LIBUSB_SITE)/$(LIBUSB_SOURCE) + $(call DOWNLOAD,$(LIBUSB_SITE),$(LIBUSB_SOURCE)) touch -c $@ libusb-source: $(DL_DIR)/$(LIBUSB_SOURCE) $(LIBUSB_PATCH) diff --git a/package/links/links.mk b/package/links/links.mk index c9de65b62..cea6cd664 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -9,7 +9,7 @@ LINKS_SOURCE:=links-$(LINKS_VERSION).tar.gz LINKS_DIR:=$(BUILD_DIR)/links-$(LINKS_VERSION) $(DL_DIR)/$(LINKS_SOURCE): - $(WGET) -P $(DL_DIR) $(LINKS_SITE)/$(LINKS_SOURCE) + $(call DOWNLOAD,$(LINKS_SITE),$(LINKS_SOURCE)) links-source: $(DL_DIR)/$(LINKS_SOURCE) diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index 8d863abb1..38d77da39 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -39,7 +39,7 @@ LINUX_FUSION_MAKE_OPTS += HEADERDIR=$(STAGING_DIR) #LINUX_FUSION_MAKE_OPTS += __KERNEL__=$(LINUX26_VERSION) $(DL_DIR)/$(LINUX_FUSION_SOURCE): - $(WGET) -P $(DL_DIR) $(LINUX_FUSION_SITE)/$(LINUX_FUSION_SOURCE) + $(call DOWNLOAD,$(LINUX_FUSION_SITE),$(LINUX_FUSION_SOURCE)) $(LINUX_FUSION_DIR)/.unpacked: $(DL_DIR)/$(LINUX_FUSION_SOURCE) $(LINUX_FUSION_CAT) $(DL_DIR)/$(LINUX_FUSION_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk index 802cb93d9..9e9a0909f 100644 --- a/package/lm-sensors/lm-sensors.mk +++ b/package/lm-sensors/lm-sensors.mk @@ -12,7 +12,7 @@ LM_SENSORS_BINARY:=prog/sensors/sensors LM_SENSORS_TARGET_BINARY:=usr/bin/sensors $(DL_DIR)/$(LM_SENSORS_SOURCE): - $(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_SOURCE) + $(call DOWNLOAD,$(LM_SENSORS_SITE),$(LM_SENSORS_SOURCE)) $(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/lockfile-progs/lockfile-progs.mk b/package/lockfile-progs/lockfile-progs.mk index dd0153dce..e1f4c1700 100644 --- a/package/lockfile-progs/lockfile-progs.mk +++ b/package/lockfile-progs/lockfile-progs.mk @@ -11,7 +11,7 @@ LOCKFILE_PROGS_DIR:=$(BUILD_DIR)/lockfile-progs-0.1.11 LOCKFILE_PROGS_BINARY:=usr/bin/lockfile-create $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE): - $(WGET) -P $(DL_DIR) $(LOCKFILE_PROGS_SITE)/$(LOCKFILE_PROGS_SOURCE) + $(call DOWNLOAD,$(LOCKFILE_PROGS_SITE),$(LOCKFILE_PROGS_SOURCE)) lockfile-progs-source: $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE) diff --git a/package/logrotate/logrotate.mk b/package/logrotate/logrotate.mk index d939d1f67..8c8cc7c41 100644 --- a/package/logrotate/logrotate.mk +++ b/package/logrotate/logrotate.mk @@ -6,7 +6,7 @@ LOGROTATE_BINARY:=logrotate LOGROTATE_TARGET_BINARY:=usr/sbin/$(LOGROTATE_BINARY) $(DL_DIR)/$(LOGROTATE_SOURCE): - $(WGET) -P $(DL_DIR) $(LOGROTATE_SITE)/$(LOGROTATE_SOURCE) + $(call DOWNLOAD,$(LOGROTATE_SITE),$(LOGROTATE_SOURCE)) $(LOGROTATE_DIR)/.source: $(DL_DIR)/$(LOGROTATE_SOURCE) $(ZCAT) $(DL_DIR)/$(LOGROTATE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index cd998c0eb..03c8a40ca 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -26,7 +26,7 @@ LRZSZ_SOURCE:=lrzsz-$(LRZSZ_VERSION).tar.gz LRZSZ_DIR:=$(BUILD_DIR)/lrzsz-$(LRZSZ_VERSION) $(DL_DIR)/$(LRZSZ_SOURCE): - $(WGET) -P $(DL_DIR) $(LRZSZ_SITE)/$(LRZSZ_SOURCE) + $(call DOWNLOAD,$(LRZSZ_SITE),$(LRZSZ_SOURCE)) lrzsz-source: $(DL_DIR)/$(LRZSZ_SOURCE) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index d4135b237..8551a41df 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -21,7 +21,7 @@ BR2_LSOF_CFLAGS+=-UHASIPv6 endif $(DL_DIR)/$(LSOF_SOURCE): - $(WGET) -P $(DL_DIR) $(LSOF_SITE)/$(LSOF_SOURCE) + $(call DOWNLOAD,$(LSOF_SITE),$(LSOF_SOURCE)) lsof-source: $(DL_DIR)/$(LSOF_SOURCE) diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 5dc03cd93..178983201 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -28,7 +28,7 @@ LTP_PATCHES+=ltp-testsuite-disable-ipv6-tests.patch endif $(DL_DIR)/$(LTP_TESTSUITE_SOURCE): - $(WGET) -P $(DL_DIR) $(LTP_TESTSUITE_SITE)/$(LTP_TESTSUITE_SOURCE) + $(call DOWNLOAD,$(LTP_TESTSUITE_SITE),$(LTP_TESTSUITE_SOURCE)) ltp-testsuite-source: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index 25eecb7e2..ab7913778 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -17,12 +17,12 @@ LTRACE_ARCH:=arm endif $(DL_DIR)/$(LTRACE_SOURCE): - $(WGET) -P $(DL_DIR) $(LTRACE_SITE)/$(LTRACE_SOURCE) + $(call DOWNLOAD,$(LTRACE_SITE),$(LTRACE_SOURCE)) ifneq ($(LTRACE_PATCH),) LTRACE_PATCH_FILE:=$(DL_DIR)/$(LTRACE_PATCH) $(LTRACE_PATCH_FILE): - $(WGET) -P $(DL_DIR) $(LTRACE_SITE)/$(LTRACE_PATCH) + $(call DOWNLOAD,$(LTRACE_SITE),$(LTRACE_PATCH)) else LTRACE_PATCH_FILE:= diff --git a/package/ltt/ltt.mk b/package/ltt/ltt.mk index 32e6c82dc..f08e25123 100644 --- a/package/ltt/ltt.mk +++ b/package/ltt/ltt.mk @@ -13,7 +13,7 @@ LTT_BINARY:=Visualizer/tracevisualizer LTT_TARGET_BINARY:=Daemon/tracedaemon $(DL_DIR)/$(LTT_SOURCE): - $(WGET) -P $(DL_DIR) $(LTT_SITE)/$(LTT_SOURCE) + $(call DOWNLOAD,$(LTT_SITE),$(LTT_SOURCE)) ltt-source: $(DL_DIR)/$(LTT_SOURCE) diff --git a/package/lua/lua.mk b/package/lua/lua.mk index b6a6ddef4..f330c947d 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -16,7 +16,7 @@ LUA_CFLAGS=-DLUA_USE_LINUX LUA_MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" $(DL_DIR)/$(LUA_SOURCE): - $(WGET) -P $(DL_DIR) $(LUA_SITE)/$(LUA_SOURCE) + $(call DOWNLOAD,$(LUA_SITE),$(LUA_SOURCE)) $(LUA_DIR)/.unpacked: $(DL_DIR)/$(LUA_SOURCE) $(LUA_CAT) $(DL_DIR)/$(LUA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 6b7725bff..1c1512935 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -34,7 +34,7 @@ LVM2_SBIN:=lvchange lvcreate lvdisplay lvextend lvm lvmchange lvmdiskscan lvmsad LVM2_TARGET_SBINS=$(foreach lvm2sbin, $(LVM2_SBIN), $(TARGET_DIR)/sbin/$(lvm2sbin)) $(DL_DIR)/$(LVM2_SOURCE): - $(WGET) -P $(DL_DIR) $(LVM2_SITE)/$(LVM2_SOURCE) + $(call DOWNLOAD,$(LVM2_SITE),$(LVM2_SOURCE)) lvm2-source: $(DL_DIR)/$(LVM2_SOURCE) diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index 130292f08..f92c44e09 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -18,7 +18,7 @@ HOST_LZMA_IF_ANY=$(shell toolchain/dependencies/check-host-lzma.sh) $(DL_DIR)/$(LZMA_SOURCE): - $(WGET) -P $(DL_DIR) $(LZMA_SITE)/$(LZMA_SOURCE) + $(call DOWNLOAD,$(LZMA_SITE),$(LZMA_SOURCE)) ###################################################################### # diff --git a/package/m4/m4.mk b/package/m4/m4.mk index ab24ea0dc..b7bfe9353 100644 --- a/package/m4/m4.mk +++ b/package/m4/m4.mk @@ -21,7 +21,7 @@ gl_cv_absolute_wchar_h=gl_cv_absolute_wchar_h=__fpending.h endif $(DL_DIR)/$(M4_SOURCE): - $(WGET) -P $(DL_DIR) $(M4_SITE)/$(M4_SOURCE) + $(call DOWNLOAD,$(M4_SITE),$(M4_SOURCE)) m4-source: $(DL_DIR)/$(M4_SOURCE) diff --git a/package/make/make.mk b/package/make/make.mk index da544a7be..268f3b6e1 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -12,7 +12,7 @@ GNUMAKE_BINARY:=make GNUMAKE_TARGET_BINARY:=usr/bin/make $(DL_DIR)/$(GNUMAKE_SOURCE): - $(WGET) -P $(DL_DIR) $(GNUMAKE_SITE)/$(GNUMAKE_SOURCE) + $(call DOWNLOAD,$(GNUMAKE_SITE),$(GNUMAKE_SOURCE)) make-source: $(DL_DIR)/$(GNUMAKE_SOURCE) diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index af278de12..e2e4e0ed5 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -73,34 +73,34 @@ MATCHBOX_KB_DIR:=$(BUILD_DIR)/$(MATCHBOX_KB_BIN)-$(MATCHBOX_KB_VERSION) ############################################################# $(DL_DIR)/$(MATCHBOX_LIB_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/libmatchbox/$(MATCHBOX_LIB_VERSION)/$(MATCHBOX_LIB_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SITE)/libmatchbox/$(MATCHBOX_LIB_VERSION),$(MATCHBOX_LIB_SOURCE)) $(DL_DIR)/$(MATCHBOX_SNOTIFY_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SNOTIFY_SITE)/$(MATCHBOX_SNOTIFY_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SNOTIFY_SITE),$(MATCHBOX_SNOTIFY_SOURCE)) $(DL_DIR)/$(MATCHBOX_WM_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/$(MATCHBOX_WM_BIN)/$(MATCHBOX_WM_MAJORVER)/$(MATCHBOX_WM_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SITE)/$(MATCHBOX_WM_BIN)/$(MATCHBOX_WM_MAJORVER),$(MATCHBOX_WM_SOURCE)) $(DL_DIR)/$(MATCHBOX_SM_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/$(MATCHBOX_SM_BIN)/$(MATCHBOX_SM_MAJORVER)/$(MATCHBOX_SM_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SITE)/$(MATCHBOX_SM_BIN)/$(MATCHBOX_SM_MAJORVER),$(MATCHBOX_SM_SOURCE)) #$(DL_DIR)/$(MATCHBOX_DM_SOURCE): -# $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/$(MATCHBOX_SM_BIN)/$(MATCHBOX_SM_MAJORVER)/$(MATCHBOX_SM_SOURCE) +# $(call DOWNLOAD,$(MATCHBOX_SITE)/$(MATCHBOX_SM_BIN)/$(MATCHBOX_SM_MAJORVER),$(MATCHBOX_SM_SOURCE)) $(DL_DIR)/$(MATCHBOX_CN_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/$(MATCHBOX_CN_BIN)/$(MATCHBOX_CN_MAJORVER)/$(MATCHBOX_CN_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SITE)/$(MATCHBOX_CN_BIN)/$(MATCHBOX_CN_MAJORVER),$(MATCHBOX_CN_SOURCE)) $(DL_DIR)/$(MATCHBOX_PL_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/$(MATCHBOX_PL_BIN)/$(MATCHBOX_PL_MAJORVER)/$(MATCHBOX_PL_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SITE)/$(MATCHBOX_PL_BIN)/$(MATCHBOX_PL_MAJORVER),$(MATCHBOX_PL_SOURCE)) $(DL_DIR)/$(MATCHBOX_DP_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/$(MATCHBOX_DP_BIN)/$(MATCHBOX_DP_MAJORVER)/$(MATCHBOX_DP_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SITE)/$(MATCHBOX_DP_BIN)/$(MATCHBOX_DP_MAJORVER),$(MATCHBOX_DP_SOURCE)) $(DL_DIR)/$(MATCHBOX_FK_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/$(MATCHBOX_FK_BIN)/$(MATCHBOX_FK_MAJORVER)/$(MATCHBOX_FK_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SITE)/$(MATCHBOX_FK_BIN)/$(MATCHBOX_FK_MAJORVER),$(MATCHBOX_FK_SOURCE)) $(DL_DIR)/$(MATCHBOX_KB_SOURCE): - $(WGET) -P $(DL_DIR) $(MATCHBOX_SITE)/$(MATCHBOX_KB_BIN)/$(MATCHBOX_KB_MAJORVER)/$(MATCHBOX_KB_SOURCE) + $(call DOWNLOAD,$(MATCHBOX_SITE)/$(MATCHBOX_KB_BIN)/$(MATCHBOX_KB_MAJORVER),$(MATCHBOX_KB_SOURCE)) matchbox-source: $(DL_DIR)/$(MATCHBOX_LIB_SOURCE) $(DL_DIR)/$(MATCHBOX_WM_SOURCE) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 68a58dbe0..1e330275c 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -15,11 +15,11 @@ MDADM_TARGET_BINARY:=sbin/mdadm ifneq ($(MDADM_PATCH),) MDADM_PATCH_FILE:=$(DL_DIR)/$(MDADM_PATCH) $(MDADM_PATCH_FILE): - $(WGET) -P $(DL_DIR) $(MDADM_SITE)/$(MDADM_PATCH) + $(call DOWNLOAD,$(MDADM_SITE),$(MDADM_PATCH)) endif $(DL_DIR)/$(MDADM_SOURCE): $(MDADM_PATCH_FILE) - $(WGET) -P $(DL_DIR) $(MDADM_SITE)/$(MDADM_SOURCE) + $(call DOWNLOAD,$(MDADM_SITE),$(MDADM_SOURCE)) touch -c $@ $(MDADM_DIR)/.unpacked: $(DL_DIR)/$(MDADM_SOURCE) diff --git a/package/mdnsresponder/mdnsresponder.mk b/package/mdnsresponder/mdnsresponder.mk index ee03a2bdf..952f600ce 100644 --- a/package/mdnsresponder/mdnsresponder.mk +++ b/package/mdnsresponder/mdnsresponder.mk @@ -15,7 +15,7 @@ ifeq ($(BR2_PACKAGE_MDNSRESPONDER_UTILS),y) endif $(DL_DIR)/$(MDNSRESPONDER_SOURCE): - $(WGET) -P $(DL_DIR) $(MDNSRESPONDER_SITE) + $(call DOWNLOAD,$(MDNSRESPONDER_SITE)) $(MDNSRESPONDER_DIR)/.unpacked: $(DL_DIR)/$(MDNSRESPONDER_SOURCE) $(MDNSRESPONDER_CAT) $(DL_DIR)/$(MDNSRESPONDER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/memstat/memstat.mk b/package/memstat/memstat.mk index a8f81b2e6..7220aeeeb 100644 --- a/package/memstat/memstat.mk +++ b/package/memstat/memstat.mk @@ -10,7 +10,7 @@ MEMSTAT_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/m/memstat MEMSTAT_DIR:=$(BUILD_DIR)/memstat-$(MEMSTAT_VERSION) $(DL_DIR)/$(MEMSTAT_SOURCE): - $(WGET) -P $(DL_DIR) $(MEMSTAT_SITE)/$(MEMSTAT_SOURCE) + $(call DOWNLOAD,$(MEMSTAT_SITE),$(MEMSTAT_SOURCE)) $(MEMSTAT_DIR)/.unpacked: $(DL_DIR)/$(MEMSTAT_SOURCE) $(ZCAT) $(DL_DIR)/$(MEMSTAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/memtester/memtester.mk b/package/memtester/memtester.mk index 04b69ebe5..e10f965dc 100644 --- a/package/memtester/memtester.mk +++ b/package/memtester/memtester.mk @@ -11,7 +11,7 @@ MEMTESTER_BINARY:=memtester MEMTESTER_TARGET_BINARY:=usr/bin/memtester $(DL_DIR)/$(MEMTESTER_SOURCE): - $(WGET) -P $(DL_DIR) $(MEMTESTER_SITE)/$(MEMTESTER_SOURCE) + $(call DOWNLOAD,$(MEMTESTER_SITE),$(MEMTESTER_SOURCE)) memtester-source: $(DL_DIR)/$(MEMTESTER_SOURCE) diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk index 3b70bb23f..d4498ce82 100644 --- a/package/metacity/metacity.mk +++ b/package/metacity/metacity.mk @@ -18,10 +18,10 @@ METACITY_CAT2:=$(ZCAT) METACITY_SITE2:=http://art.gnome.org/download/themes/metacity/1190 $(DL_DIR)/$(METACITY_SOURCE): - $(WGET) -P $(DL_DIR) $(METACITY_SITE)/$(METACITY_SOURCE) + $(call DOWNLOAD,$(METACITY_SITE),$(METACITY_SOURCE)) $(DL_DIR)/$(METACITY_SOURCE2): - $(WGET) -P $(DL_DIR) $(METACITY_SITE2)/$(METACITY_SOURCE2) + $(call DOWNLOAD,$(METACITY_SITE2),$(METACITY_SOURCE2)) metacity-source: $(DL_DIR)/$(METACITY_SOURCE) $(DL_DIR)/$(METACITY_SOURCE2) diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk index 01d9b3114..dbdadadc4 100644 --- a/package/microcom/microcom.mk +++ b/package/microcom/microcom.mk @@ -31,7 +31,7 @@ MICROCOM_SOURCE:=m102.tar.gz MICROCOM_DIR:=$(BUILD_DIR)/microcom-$(MICROCOM_VERSION) $(DL_DIR)/$(MICROCOM_SOURCE): - $(WGET) -P $(DL_DIR) $(MICROCOM_SITE)/$(MICROCOM_SOURCE) + $(call DOWNLOAD,$(MICROCOM_SITE),$(MICROCOM_SOURCE)) microcom-source: $(DL_DIR)/$(MICROCOM_SOURCE) diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk index c3552adf6..79ddff44b 100644 --- a/package/microperl/microperl.mk +++ b/package/microperl/microperl.mk @@ -19,7 +19,7 @@ MICROPERL_MODS+=File/Basename.pm Errno.pm Config.pm IO/File.pm Symbol.pm \ DynaLoader.pm AutoLoader.pm Carp/Heavy.pm endif $(DL_DIR)/$(MICROPERL_SOURCE): - $(WGET) -P $(DL_DIR) $(MICROPERL_SITE)/$(MICROPERL_SOURCE) + $(call DOWNLOAD,$(MICROPERL_SITE),$(MICROPERL_SOURCE)) $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE) $(MICROPERL_CAT) $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/microwin/microwin.mk b/package/microwin/microwin.mk index 2951415aa..710ab8360 100644 --- a/package/microwin/microwin.mk +++ b/package/microwin/microwin.mk @@ -18,7 +18,7 @@ MICROWIN_VERSION=$(subst $(MICROWIN_DIR)/microwindows-,,$(wildcard $(MICROWIN_DI MICROWIN_CONFIG:=$(MICROWIN_DIR)/src/Configs/config.uclibc $(DL_DIR)/$(MICROWIN_SOURCE): - $(WGET) -P $(DL_DIR) $(MICROWIN_SITE)/$(MICROWIN_SOURCE) + $(call DOWNLOAD,$(MICROWIN_SITE),$(MICROWIN_SOURCE)) microwin-source: $(DL_DIR)/$(MICROWIN_SOURCE) diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk index 1aaaa0474..a5357ec47 100644 --- a/package/mii-diag/mii-diag.mk +++ b/package/mii-diag/mii-diag.mk @@ -15,11 +15,11 @@ MIIDIAG_BINARY:=usr/sbin/mii-diag ifneq ($(MIIDIAG_PATCH_FILE),) MIIDIAG_PATCH=$(DL_DIR)/$(MIIDIAG_PATCH_FILE) $(MIIDIAG_PATCH): - $(WGET) -P $(DL_DIR) $(MIIDIAG_SITE)/$(MIIDIAG_PATCH_FILE) + $(call DOWNLOAD,$(MIIDIAG_SITE),$(MIIDIAG_PATCH_FILE)) endif $(DL_DIR)/$(MIIDIAG_SOURCE): - $(WGET) -P $(DL_DIR) $(MIIDIAG_SITE)/$(MIIDIAG_SOURCE) + $(call DOWNLOAD,$(MIIDIAG_SITE),$(MIIDIAG_SOURCE)) $(MIIDIAG_DIR)/.unpacked: $(DL_DIR)/$(MIIDIAG_SOURCE) $(MIIDIAG_PATCH) mkdir -p $(MIIDIAG_DIR) diff --git a/package/mkdosfs/mkdosfs.mk b/package/mkdosfs/mkdosfs.mk index fb6f032be..e147da6ed 100644 --- a/package/mkdosfs/mkdosfs.mk +++ b/package/mkdosfs/mkdosfs.mk @@ -12,7 +12,7 @@ MKDOSFS_BINARY:=mkdosfs/mkdosfs MKDOSFS_TARGET_BINARY:=sbin/mkdosfs $(DL_DIR)/$(MKDOSFS_SOURCE): - $(WGET) -P $(DL_DIR) $(MKDOSFS_SITE)/$(MKDOSFS_SOURCE) + $(call DOWNLOAD,$(MKDOSFS_SITE),$(MKDOSFS_SOURCE)) mkdosfs-source: $(DL_DIR)/$(MKDOSFS_SOURCE) diff --git a/package/module-init-tools/module-init-tools.mk b/package/module-init-tools/module-init-tools.mk index f788fc458..b135f6a4c 100644 --- a/package/module-init-tools/module-init-tools.mk +++ b/package/module-init-tools/module-init-tools.mk @@ -15,7 +15,7 @@ MODULE_INIT_TOOLS_TARGET_BINARY=$(TARGET_DIR)/sbin/$(MODULE_INIT_TOOLS_BINARY) STRIPPROG=$(STRIPCMD) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE): - $(WGET) -P $(DL_DIR) $(MODULE_INIT_TOOLS_SITE)/$(MODULE_INIT_TOOLS_SOURCE) + $(call DOWNLOAD,$(MODULE_INIT_TOOLS_SITE),$(MODULE_INIT_TOOLS_SOURCE)) $(MODULE_INIT_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) $(MODULE_INIT_TOOLS_CAT) $(DL_DIR)/$(MODULE_INIT_TOOLS_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/package/modutils/modutils.mk b/package/modutils/modutils.mk index f641ffea8..ceffacce0 100644 --- a/package/modutils/modutils.mk +++ b/package/modutils/modutils.mk @@ -15,7 +15,7 @@ MODUTILS_TARGET_BINARY=sbin/$(MODUTILS_BINARY) STRIPPROG=$(STRIPCMD) $(DL_DIR)/$(MODUTILS_SOURCE): - $(WGET) -P $(DL_DIR) $(MODUTILS_SITE)/$(MODUTILS_SOURCE) + $(call DOWNLOAD,$(MODUTILS_SITE),$(MODUTILS_SOURCE)) ############################################################# # diff --git a/package/mpatrol/mpatrol.mk b/package/mpatrol/mpatrol.mk index 83115eb08..4e9aa00f2 100644 --- a/package/mpatrol/mpatrol.mk +++ b/package/mpatrol/mpatrol.mk @@ -37,7 +37,7 @@ endif endif $(DL_DIR)/$(MPATROL_SOURCE): - $(WGET) -P $(DL_DIR) $(MPATROL_SITE)/$(MPATROL_SOURCE) + $(call DOWNLOAD,$(MPATROL_SITE),$(MPATROL_SOURCE)) mpatrol-source: $(DL_DIR)/$(MPATROL_SOURCE) diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index bc01667fb..631be64a0 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -21,11 +21,11 @@ ifneq ($(MPFR_PATCH),) MPFR_PATCH_SOURCE:=$(DL_DIR)/$(MPFR_PATCH_FILE) $(MPFR_PATCH_SOURCE): - $(WGET) -O $@ $(MPFR_SITE)/$(MPFR_PATCH) + $(WGET) -O $@ $(MPFR_SITE),$(MPFR_PATCH) endif $(DL_DIR)/$(MPFR_SOURCE): - $(WGET) -P $(DL_DIR) $(MPFR_SITE)/$(MPFR_SOURCE) + $(call DOWNLOAD,$(MPFR_SITE),$(MPFR_SOURCE)) $(MPFR_DIR)/.unpacked: $(DL_DIR)/$(MPFR_SOURCE) $(MPFR_PATCH_SOURCE) $(MPFR_CAT) $(DL_DIR)/$(MPFR_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index f2eabf710..ffb1f4f66 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -14,10 +14,10 @@ MROUTED_BINARY:=mrouted MROUTED_TARGET_BINARY:=usr/sbin/mrouted $(DL_DIR)/$(MROUTED_SOURCE): - $(WGET) -P $(DL_DIR) $(MROUTED_SITE)/$(MROUTED_SOURCE) + $(call DOWNLOAD,$(MROUTED_SITE),$(MROUTED_SOURCE)) $(DL_DIR)/$(MROUTED_PATCH): - $(WGET) -P $(DL_DIR) $(MROUTED_SITE)/$(MROUTED_PATCH) + $(call DOWNLOAD,$(MROUTED_SITE),$(MROUTED_PATCH)) $(MROUTED_DIR)/.unpacked: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH) $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/mtd/20050122/mtd.mk b/package/mtd/20050122/mtd.mk index 20edfb450..b5a9d5c50 100644 --- a/package/mtd/20050122/mtd.mk +++ b/package/mtd/20050122/mtd.mk @@ -22,7 +22,7 @@ SUMTOOL := $(MTD_HOST_DIR)/util/sumtool ifneq ($(MTD_SOURCE),) $(DL_DIR)/$(MTD_SOURCE): - $(WGET) -P $(DL_DIR) $(MTD_SITE)/$(MTD_SOURCE) + $(call DOWNLOAD,$(MTD_SITE),$(MTD_SOURCE)) endif $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) diff --git a/package/mtd/20061007/mtd.mk b/package/mtd/20061007/mtd.mk index 7d74a6474..dfd348579 100644 --- a/package/mtd/20061007/mtd.mk +++ b/package/mtd/20061007/mtd.mk @@ -20,7 +20,7 @@ MKFS_JFFS2 := $(MTD_HOST_DIR)/mkfs.jffs2 SUMTOOL := $(MTD_HOST_DIR)/sumtool $(DL_DIR)/$(MTD_SOURCE): - $(WGET) -P $(DL_DIR) $(MTD_SITE)/$(MTD_SOURCE) + $(call DOWNLOAD,$(MTD_SITE),$(MTD_SOURCE)) $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/mtd/mtd-utils.git/mtd.mk b/package/mtd/mtd-utils.git/mtd.mk index ca25ee56b..e4ec4b29e 100644 --- a/package/mtd/mtd-utils.git/mtd.mk +++ b/package/mtd/mtd-utils.git/mtd.mk @@ -21,7 +21,7 @@ MKFS_JFFS2 := $(MTD_HOST_DIR)/mkfs.jffs2 SUMTOOL := $(MTD_HOST_DIR)/sumtool $(DL_DIR)/$(MTD_SOURCE): - $(WGET) -O $(DL_DIR)/$(MTD_SOURCE) "$(MTD_URL)" + $(call DOWNLOAD,"$(MTD_URL)") $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/mtd/mtd-utils/mtd.mk b/package/mtd/mtd-utils/mtd.mk index 56120174c..f6b67da93 100644 --- a/package/mtd/mtd-utils/mtd.mk +++ b/package/mtd/mtd-utils/mtd.mk @@ -21,7 +21,7 @@ MKFS_JFFS2 := $(MTD_HOST_DIR)/mkfs.jffs2 SUMTOOL := $(MTD_HOST_DIR)/sumtool $(DL_DIR)/$(MTD_SOURCE): - $(WGET) -P $(DL_DIR) $(MTD_SITE)/$(MTD_SOURCE) + $(call DOWNLOAD,$(MTD_SITE),$(MTD_SOURCE)) $(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk index a92995043..b87062646 100644 --- a/package/multimedia/alsa-lib/alsa-lib.mk +++ b/package/multimedia/alsa-lib/alsa-lib.mk @@ -28,7 +28,7 @@ ifeq ($(BR2_SOFT_FLOAT),y) endif $(DL_DIR)/$(ALSA_LIB_SOURCE): - $(WGET) -P $(DL_DIR) $(ALSA_LIB_SITE)/$(ALSA_LIB_SOURCE) + $(call DOWNLOAD,$(ALSA_LIB_SITE),$(ALSA_LIB_SOURCE)) $(ALSA_LIB_DIR)/.unpacked: $(DL_DIR)/$(ALSA_LIB_SOURCE) $(ALSA_LIB_CAT) $(DL_DIR)/$(ALSA_LIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/alsa-utils/alsa-utils.mk b/package/multimedia/alsa-utils/alsa-utils.mk index 6e99d041a..da04363f3 100644 --- a/package/multimedia/alsa-utils/alsa-utils.mk +++ b/package/multimedia/alsa-utils/alsa-utils.mk @@ -12,7 +12,7 @@ ALSA_UTILS_BINARY:=alsactl/alsactl ALSA_UTILS_TARGET_BINARY:=usr/sbin/alsactl $(DL_DIR)/$(ALSA_UTILS_SOURCE): - $(WGET) -P $(DL_DIR) $(ALSA_UTILS_SITE)/$(ALSA_UTILS_SOURCE) + $(call DOWNLOAD,$(ALSA_UTILS_SITE),$(ALSA_UTILS_SOURCE)) $(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE) $(ALSA_UTILS_CAT) $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/asterisk/asterisk.mk b/package/multimedia/asterisk/asterisk.mk index ef5c14c37..9d50f2433 100644 --- a/package/multimedia/asterisk/asterisk.mk +++ b/package/multimedia/asterisk/asterisk.mk @@ -11,7 +11,7 @@ ASTERISK_BINARY:=asterisk ASTERISK_TARGET_BINARY:=usr/sbin/asterisk $(DL_DIR)/$(ASTERISK_SOURCE): - $(WGET) -P $(DL_DIR) $(ASTERISK_SITE)/$(ASTERISK_SOURCE) + $(call DOWNLOAD,$(ASTERISK_SITE),$(ASTERISK_SOURCE)) $(ASTERISK_DIR)/.source: $(DL_DIR)/$(ASTERISK_SOURCE) $(ZCAT) $(DL_DIR)/$(ASTERISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/aumix/aumix.mk b/package/multimedia/aumix/aumix.mk index a324658cf..d6f5fbd38 100644 --- a/package/multimedia/aumix/aumix.mk +++ b/package/multimedia/aumix/aumix.mk @@ -11,7 +11,7 @@ AUMIX_DIR=$(BUILD_DIR)/aumix-$(AUMIX_VERSION) AUMIX_CAT:=$(BZCAT) $(DL_DIR)/$(AUMIX_SOURCE): - $(WGET) -P $(DL_DIR) $(AUMIX_SITE)/$(AUMIX_SOURCE) + $(call DOWNLOAD,$(AUMIX_SITE),$(AUMIX_SOURCE)) $(AUMIX_DIR)/.unpacked: $(DL_DIR)/$(AUMIX_SOURCE) $(AUMIX_CAT) $(DL_DIR)/$(AUMIX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/festival/lexicons/festlex.mk b/package/multimedia/festival/lexicons/festlex.mk index e9a651dd8..80d37d595 100644 --- a/package/multimedia/festival/lexicons/festlex.mk +++ b/package/multimedia/festival/lexicons/festlex.mk @@ -12,13 +12,13 @@ FESTLEX_INSTALL_DIR = $(TARGET_DIR)/usr/share $(FESTLEX_STATUS_DIR)/.downloaded: mkdir -p $(FESTLEX_STATUS_DIR) ifeq ($(BR2_PACKAGE_FESTLEX_CMU),y) - $(Q)test -e $(DL_DIR)/$(LEX1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX1) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX1)) endif ifeq ($(BR2_PACKAGE_FESTLEX_OALD),y) - $(Q)test -e $(DL_DIR)/$(LEX2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX2) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX2)) endif ifeq ($(BR2_PACKAGE_FESTLEX_POS),y) - $(Q)test -e $(DL_DIR)/$(LEX3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(LEX3) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(LEX3)) endif touch $@ diff --git a/package/multimedia/festival/voices/festvox.mk b/package/multimedia/festival/voices/festvox.mk index d44493c83..a2ee169f3 100644 --- a/package/multimedia/festival/voices/festvox.mk +++ b/package/multimedia/festival/voices/festvox.mk @@ -21,35 +21,35 @@ FESTVOX_INSTALL_DIR = $(TARGET_DIR)/usr/share $(FESTVOX_STATUS_DIR)/.downloaded: mkdir -p $(FESTVOX_STATUS_DIR) ifeq ($(BR2_PACKAGE_FESTVOX_AWB),y) - $(Q)test -e $(DL_DIR)/$(VOICE1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE1) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE1)) endif ifeq ($(BR2_PACKAGE_FESTVOX_BDL),y) - $(Q)test -e $(DL_DIR)/$(VOICE2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE2) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE2)) endif ifeq ($(BR2_PACKAGE_FESTVOX_JMK),y) - $(Q)test -e $(DL_DIR)/$(VOICE3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE3) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE3)) endif ifeq ($(BR2_PACKAGE_FESTVOX_SLT),y) - $(Q)test -e $(DL_DIR)/$(VOICE4) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE4) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE4)) endif ifeq ($(BR2_PACKAGE_FESTVOX_AWB_MULTISYN),y) - $(Q)test -e $(DL_DIR)/$(VOICE5) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE5) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE5)) endif ifeq ($(BR2_PACKAGE_FESTVOX_JMK_MULTISYN),y) - $(Q)test -e $(DL_DIR)/$(VOICE6) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE6) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE6)) endif ifeq ($(BR2_PACKAGE_FESTVOX_KAL_SIXTEENK),y) - $(Q)test -e $(DL_DIR)/$(VOICE7) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE7) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE7)) endif ifeq ($(BR2_PACKAGE_FESTVOX_KED_EIGHTK),y) - $(Q)test -e $(DL_DIR)/$(VOICE8) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE8) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE8)) endif ifeq ($(BR2_PACKAGE_FESTVOX_KED_SIXTEENK),y) - $(Q)test -e $(DL_DIR)/$(VOICE9) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(VOICE9) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(VOICE9)) endif - $(Q)test -e $(DL_DIR)/$(FRONTEND1) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND1) - $(Q)test -e $(DL_DIR)/$(FRONTEND2) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND2) - $(Q)test -e $(DL_DIR)/$(FRONTEND3) || $(WGET) -P $(DL_DIR) $(FESTIVAL_SITE)/$(FRONTEND3) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND1)) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND2)) + $(call DOWNLOAD,$(FESTIVAL_SITE),$(FRONTEND3)) touch $@ diff --git a/package/multimedia/libid3tag/libid3tag.mk b/package/multimedia/libid3tag/libid3tag.mk index 26f35c879..0308f0229 100644 --- a/package/multimedia/libid3tag/libid3tag.mk +++ b/package/multimedia/libid3tag/libid3tag.mk @@ -13,7 +13,7 @@ LIBID3TAG_BIN:=libid3tag.so.0.3.0 LIBID3TAG_TARGET_BIN:=usr/lib/$(LIBID3TAG_BIN) $(DL_DIR)/$(LIBID3TAG_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBID3TAG_SITE)/$(LIBID3TAG_SOURCE) + $(call DOWNLOAD,$(LIBID3TAG_SITE),$(LIBID3TAG_SOURCE)) $(LIBID3TAG_DIR)/.unpacked: $(DL_DIR)/$(LIBID3TAG_SOURCE) $(LIBID3TAG_CAT) $(DL_DIR)/$(LIBID3TAG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/libmad/libmad.mk b/package/multimedia/libmad/libmad.mk index 85754545f..4d9200dc0 100644 --- a/package/multimedia/libmad/libmad.mk +++ b/package/multimedia/libmad/libmad.mk @@ -11,7 +11,7 @@ LIBMAD_DIR=$(BUILD_DIR)/libmad-$(LIBMAD_VERSION) LIBMAD_CAT:=$(ZCAT) $(DL_DIR)/$(LIBMAD_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBMAD_SITE)/$(LIBMAD_SOURCE) + $(call DOWNLOAD,$(LIBMAD_SITE),$(LIBMAD_SOURCE)) $(LIBMAD_DIR)/.unpacked: $(DL_DIR)/$(LIBMAD_SOURCE) $(LIBMAD_CAT) $(DL_DIR)/$(LIBMAD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/libsndfile/libsndfile.mk b/package/multimedia/libsndfile/libsndfile.mk index a9584424b..b20852906 100644 --- a/package/multimedia/libsndfile/libsndfile.mk +++ b/package/multimedia/libsndfile/libsndfile.mk @@ -11,7 +11,7 @@ LIBSNDFILE_BINARY:=src/.libs/libsndfile.so LIBSNDFILE_TARGET_BINARY:=usr/lib/libsndfile.so $(DL_DIR)/$(LIBSNDFILE_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBSNDFILE_SITE)/$(LIBSNDFILE_SOURCE) + $(call DOWNLOAD,$(LIBSNDFILE_SITE),$(LIBSNDFILE_SOURCE)) $(LIBSNDFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBSNDFILE_SOURCE) $(ZCAT) $(DL_DIR)/$(LIBSNDFILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk index b99d68a32..09cee54c1 100644 --- a/package/multimedia/libvorbis/libvorbis.mk +++ b/package/multimedia/libvorbis/libvorbis.mk @@ -12,7 +12,7 @@ LIBVORBIS_TARGET_BINARY:=usr/bin/libvorbis LIBVORBIS_CAT:=$(ZCAT) $(DL_DIR)/$(LIBVORBIS_SOURCE): - $(WGET) -P $(DL_DIR) $(LIBVORBIS_SITE)/$(LIBVORBIS_SOURCE) + $(call DOWNLOAD,$(LIBVORBIS_SITE),$(LIBVORBIS_SOURCE)) $(LIBVORBIS_DIR)/.source: $(DL_DIR)/$(LIBVORBIS_SOURCE) $(LIBVORBIS_CAT) $(DL_DIR)/$(LIBVORBIS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/madplay/madplay.mk b/package/multimedia/madplay/madplay.mk index 266232581..d8219b727 100644 --- a/package/multimedia/madplay/madplay.mk +++ b/package/multimedia/madplay/madplay.mk @@ -19,7 +19,7 @@ MADPLAY_ALSA_DEP:=alsa-lib endif $(DL_DIR)/$(MADPLAY_SOURCE): - $(WGET) -P $(DL_DIR) $(MADPLAY_SITE)/$(MADPLAY_SOURCE) + $(call DOWNLOAD,$(MADPLAY_SITE),$(MADPLAY_SOURCE)) $(MADPLAY_DIR)/.unpacked: $(DL_DIR)/$(MADPLAY_SOURCE) $(MADPLAY_CAT) $(DL_DIR)/$(MADPLAY_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/mpg123/mpg123.mk b/package/multimedia/mpg123/mpg123.mk index caf979714..b32681c40 100644 --- a/package/multimedia/mpg123/mpg123.mk +++ b/package/multimedia/mpg123/mpg123.mk @@ -19,7 +19,7 @@ MPG123_ALSA_DEP:=alsa-lib endif $(DL_DIR)/$(MPG123_SOURCE): - $(WGET) -P $(DL_DIR) $(MPG123_SITE)/$(MPG123_SOURCE) + $(call DOWNLOAD,$(MPG123_SITE),$(MPG123_SOURCE)) $(MPG123_DIR)/.unpacked: $(DL_DIR)/$(MPG123_SOURCE) $(MPG123_CAT) $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk index 7d7c83032..7b3dc5f5d 100644 --- a/package/multimedia/mplayer/mplayer.mk +++ b/package/multimedia/mplayer/mplayer.mk @@ -18,7 +18,7 @@ MPLAYER_ENDIAN:=--disable-big-endian endif $(DL_DIR)/$(MPLAYER_SOURCE): - $(WGET) -P $(DL_DIR) $(MPLAYER_SITE)/$(MPLAYER_SOURCE) + $(call DOWNLOAD,$(MPLAYER_SITE),$(MPLAYER_SOURCE)) $(MPLAYER_DIR)/.unpacked: $(DL_DIR)/$(MPLAYER_SOURCE) $(MPLAYER_CAT) $(DL_DIR)/$(MPLAYER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index b56f87ce8..3318149f8 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -13,10 +13,10 @@ MUTT_BINARY:=mutt MUTT_TARGET_BINARY:=usr/bin/mutt $(DL_DIR)/$(MUTT_SOURCE): - $(WGET) -P $(DL_DIR) $(MUTT_SITE)/$(MUTT_SOURCE) + $(call DOWNLOAD,$(MUTT_SITE),$(MUTT_SOURCE)) $(DL_DIR)/$(MUTT_PATCH): - $(WGET) -P $(DL_DIR) $(MUTT_SITE)/$(MUTT_PATCH) + $(call DOWNLOAD,$(MUTT_SITE),$(MUTT_PATCH)) $(MUTT_DIR)/.unpacked: $(DL_DIR)/$(MUTT_SOURCE) $(DL_DIR)/$(MUTT_PATCH) $(MUTT_CAT) $(DL_DIR)/$(MUTT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index 39c636eee..c480149ff 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -11,7 +11,7 @@ NBD_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/ NBD_DIR=$(BUILD_DIR)/nbd-$(NBD_VERSION) $(DL_DIR)/$(NBD_SOURCE): - $(WGET) -P $(DL_DIR) $(NBD_SITE)/$(NBD_SOURCE) + $(call DOWNLOAD,$(NBD_SITE),$(NBD_SOURCE)) $(NBD_DIR)/.unpacked: $(DL_DIR)/$(NBD_SOURCE) $(NBD_CAT) $(DL_DIR)/$(NBD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 904a0136a..70f0fd618 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -38,7 +38,7 @@ endif ncftp-source: $(DL_DIR)/$(NCFTP_SOURCE) $(DL_DIR)/$(NCFTP_SOURCE): - $(WGET) -P $(DL_DIR) $(NCFTP_SITE)/$(NCFTP_SOURCE) + $(call DOWNLOAD,$(NCFTP_SITE),$(NCFTP_SOURCE)) $(NCFTP_DIR)/.source: $(DL_DIR)/$(NCFTP_SOURCE) $(BZCAT) $(DL_DIR)/$(NCFTP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index a728f50dc..0fbef7194 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -34,7 +34,7 @@ NCURSES_WANT_STATIC=--disable-static endif $(DL_DIR)/$(NCURSES_SOURCE): - $(WGET) -P $(DL_DIR) $(NCURSES_SITE)/$(NCURSES_SOURCE) + $(call DOWNLOAD,$(NCURSES_SITE),$(NCURSES_SOURCE)) $(NCURSES_DIR)/.patched: $(DL_DIR)/$(NCURSES_SOURCE) $(NCURSES_CAT) $(DL_DIR)/$(NCURSES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/netkitbase/netkitbase.mk b/package/netkitbase/netkitbase.mk index 2db10e88e..575724c70 100644 --- a/package/netkitbase/netkitbase.mk +++ b/package/netkitbase/netkitbase.mk @@ -12,7 +12,7 @@ NETKITBASE_BINARY:=inetd/inetd NETKITBASE_TARGET_BINARY:=usr/sbin/inetd $(DL_DIR)/$(NETKITBASE_SOURCE): - $(WGET) -P $(DL_DIR) $(NETKITBASE_SITE)/$(NETKITBASE_SOURCE) + $(call DOWNLOAD,$(NETKITBASE_SITE),$(NETKITBASE_SOURCE)) netkitbase-source: $(DL_DIR)/$(NETKITBASE_SOURCE) diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index aa3ffcfe3..629d32049 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -12,7 +12,7 @@ NETKITTELNET_BINARY:=telnetd/telnetd NETKITTELNET_TARGET_BINARY:=usr/sbin/telnetd $(DL_DIR)/$(NETKITTELNET_SOURCE): - $(WGET) -P $(DL_DIR) $(NETKITTELNET_SITE)/$(NETKITTELNET_SOURCE) + $(call DOWNLOAD,$(NETKITTELNET_SITE),$(NETKITTELNET_SOURCE)) netkittelnet-source: $(DL_DIR)/$(NETKITTELNET_SOURCE) diff --git a/package/netplug/netplug.mk b/package/netplug/netplug.mk index 579d6a680..99d40f55b 100644 --- a/package/netplug/netplug.mk +++ b/package/netplug/netplug.mk @@ -12,7 +12,7 @@ NETPLUG_BINARY:=netplugd NETPLUG_TARGET_BINARY:=sbin/netplugd $(DL_DIR)/$(NETPLUG_SOURCE): - $(WGET) -P $(DL_DIR) $(NETPLUG_SITE)/$(NETPLUG_SOURCE) + $(call DOWNLOAD,$(NETPLUG_SITE),$(NETPLUG_SOURCE)) netplug-source: $(DL_DIR)/$(NETPLUG_SOURCE) diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index b7b2b1401..2af8e0c7d 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -17,7 +17,7 @@ NETSNMP_WO_TRANSPORT+= UDPIPv6 TCPIPv6 endif $(DL_DIR)/$(NETSNMP_SOURCE): - $(WGET) -P $(DL_DIR) $(NETSNMP_SITE)/$(NETSNMP_SOURCE) + $(call DOWNLOAD,$(NETSNMP_SITE),$(NETSNMP_SOURCE)) $(NETSNMP_DIR)/.unpacked: $(DL_DIR)/$(NETSNMP_SOURCE) $(ZCAT) $(DL_DIR)/$(NETSNMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/newt/newt.mk b/package/newt/newt.mk index baa780bc6..f754090cf 100644 --- a/package/newt/newt.mk +++ b/package/newt/newt.mk @@ -11,7 +11,7 @@ NEWT_VERSION=0.51.0 NEWT_CFLAGS=-Os -g -fPIC $(DL_DIR)/$(NEWT_SOURCE): - $(WGET) -P $(DL_DIR) $(NEWT_SITE)/$(NEWT_SOURCE) + $(call DOWNLOAD,$(NEWT_SITE),$(NEWT_SOURCE)) $(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE) $(NEWT_CAT) $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 884f51de0..f463de110 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -19,7 +19,7 @@ BR2_NFS_UTILS_CFLAGS+=-DUTS_RELEASE='\"$(LINUX_HEADERS_VERSION)\"' $(DL_DIR)/$(NFS_UTILS_SOURCE): - $(WGET) -P $(DL_DIR) $(NFS_UTILS_SITE)/$(NFS_UTILS_SOURCE) + $(call DOWNLOAD,$(NFS_UTILS_SITE),$(NFS_UTILS_SOURCE)) nfs-utils-source: $(DL_DIR)/$(NFS_UTILS_SOURCE) diff --git a/package/ntfs-3g/ntfs-3g.mk b/package/ntfs-3g/ntfs-3g.mk index b23b95818..1e78feecc 100644 --- a/package/ntfs-3g/ntfs-3g.mk +++ b/package/ntfs-3g/ntfs-3g.mk @@ -12,7 +12,7 @@ NTFS-3G_BINARY:=ntfs-3g http://www.ntfs-3g.org/ntfs-3g-1.5130.tgz $(DL_DIR)/$(NTFS-3G_SOURCE): - $(WGET) -P $(DL_DIR) $(NTFS-3G_SITE)/$(NTFS-3G_SOURCE) + $(call DOWNLOAD,$(NTFS-3G_SITE),$(NTFS-3G_SOURCE)) $(NTFS-3G_DIR)/.source: $(DL_DIR)/$(NTFS-3G_SOURCE) $(ZCAT) $(DL_DIR)/$(NTFS-3G_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index 8aed9eefb..0b051e9a8 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -12,7 +12,7 @@ NTP_BINARY:=ntpdate/ntpdate NTP_TARGET_BINARY:=usr/bin/ntpdate $(DL_DIR)/$(NTP_SOURCE): - $(WGET) -P $(DL_DIR) $(NTP_SITE)/$(NTP_SOURCE) + $(call DOWNLOAD,$(NTP_SITE),$(NTP_SOURCE)) ntp-source: $(DL_DIR)/$(NTP_SOURCE) diff --git a/package/olsr/olsr.mk b/package/olsr/olsr.mk index 264dc5a08..fffc7c119 100644 --- a/package/olsr/olsr.mk +++ b/package/olsr/olsr.mk @@ -18,7 +18,7 @@ OLSR_PLUGINS=dot_draw dyn_gw secure OLSR_TARGET_PLUGIN=usr/lib/ $(DL_DIR)/$(OLSR_SOURCE): - $(WGET) -P $(DL_DIR) $(OLSR_SITE)/$(OLSR_SOURCE) + $(call DOWNLOAD,$(OLSR_SITE),$(OLSR_SOURCE)) olsr-source: $(DL_DIR)/$(OLSR_SOURCE) diff --git a/package/openmotif/openmotif.mk b/package/openmotif/openmotif.mk index 6773cee8c..bba952bda 100644 --- a/package/openmotif/openmotif.mk +++ b/package/openmotif/openmotif.mk @@ -12,7 +12,7 @@ OPENMOTIF_DIR:=$(BUILD_DIR)/openmotif-$(OPENMOTIF_VERSION) OPENMOTIF_HOST_DIR:=$(BUILD_DIR)/openmotif-$(OPENMOTIF_VERSION)-host $(DL_DIR)/$(OPENMOTIF_SOURCE): - $(WGET) -P $(DL_DIR) $(OPENMOTIF_SITE)/$(OPENMOTIF_SOURCE) + $(call DOWNLOAD,$(OPENMOTIF_SITE),$(OPENMOTIF_SOURCE)) openmotif-source: $(DL_DIR)/$(OPENMOTIF_SOURCE) diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 2821d8921..da03ca0f6 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -12,7 +12,7 @@ OPENNTPD_BINARY:=ntpd OPENNTPD_TARGET_BINARY:=usr/sbin/ntpd $(DL_DIR)/$(OPENNTPD_SOURCE): - $(WGET) -P $(DL_DIR) $(OPENNTPD_SITE)/$(OPENNTPD_SOURCE) + $(call DOWNLOAD,$(OPENNTPD_SITE),$(OPENNTPD_SOURCE)) $(OPENNTPD_DIR)/.source: $(DL_DIR)/$(OPENNTPD_SOURCE) $(ZCAT) $(DL_DIR)/$(OPENNTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index 0429d9eac..c7c3981e9 100644 --- a/package/openswan/openswan.mk +++ b/package/openswan/openswan.mk @@ -19,7 +19,7 @@ OPENSWAN_CFLAGS=-UDEBUG -DNO_DEBUG -ULEAK_DETECTIVE endif $(DL_DIR)/$(OPENSWAN_SOURCE): - $(WGET) -P $(DL_DIR) $(OPENSWAN_SITE)/$(OPENSWAN_SOURCE) + $(call DOWNLOAD,$(OPENSWAN_SITE),$(OPENSWAN_SOURCE)) openswan-source: $(DL_DIR)/$(OPENSWAN_SOURCE) diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 4603d2de5..e043b60c4 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -24,7 +24,7 @@ THREAD_MODEL=--enable-pthread endif $(DL_DIR)/$(OPENVPN_SOURCE): - $(WGET) -P $(DL_DIR) $(OPENVPN_SITE)/$(OPENVPN_SOURCE) + $(call DOWNLOAD,$(OPENVPN_SITE),$(OPENVPN_SOURCE)) openvpn-source: $(DL_DIR)/$(OPENVPN_SOURCE) diff --git a/package/patch/patch.mk b/package/patch/patch.mk index 528eefc06..b333b080a 100644 --- a/package/patch/patch.mk +++ b/package/patch/patch.mk @@ -12,7 +12,7 @@ GNUPATCH_BINARY:=patch GNUPATCH_TARGET_BINARY:=usr/bin/patch $(DL_DIR)/$(GNUPATCH_SOURCE): - $(WGET) -P $(DL_DIR) $(GNUPATCH_SITE)/$(GNUPATCH_SOURCE) + $(call DOWNLOAD,$(GNUPATCH_SITE),$(GNUPATCH_SOURCE)) patch-source: $(DL_DIR)/$(GNUPATCH_SOURCE) diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 8d2ad67ae..2a7fe88fd 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -25,10 +25,10 @@ PCIIDS_COMPRESSOR=cat endif $(DL_DIR)/$(PCIUTILS_SOURCE): - $(WGET) -P $(DL_DIR) $(PCIUTILS_SITE)/$(PCIUTILS_SOURCE) + $(call DOWNLOAD,$(PCIUTILS_SITE),$(PCIUTILS_SOURCE)) $(DL_DIR)/$(PCIIDS_SOURCE): - $(WGET) -P $(DL_DIR) $(PCIIDS_SITE)/$(PCIIDS_SOURCE) + $(call DOWNLOAD,$(PCIIDS_SITE),$(PCIIDS_SOURCE)) $(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE) $(PCIUTILS_CAT) $(DL_DIR)/$(PCIUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk index 1e42a2751..281f0ba8a 100644 --- a/package/pcmcia/pcmcia.mk +++ b/package/pcmcia/pcmcia.mk @@ -27,7 +27,7 @@ PCMCIA_DIR:=$(BUILD_DIR)/pcmcia-cs-3.2.7 PCMCIA_CAT:=$(ZCAT) $(DL_DIR)/$(PCMCIA_SOURCE): - $(WGET) -P $(DL_DIR) $(PCMCIA_SITE)/$(PCMCIA_SOURCE) + $(call DOWNLOAD,$(PCMCIA_SITE),$(PCMCIA_SOURCE)) pcmcia-source: $(DL_DIR)/$(PCMCIA_SOURCE) diff --git a/package/php/php.mk b/package/php/php.mk index 77a6516fe..365edec4a 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -126,7 +126,7 @@ endif endif $(DL_DIR)/$(PHP_SOURCE): - $(WGET) -P $(DL_DIR) $(PHP_SITE) + $(call DOWNLOAD,$(PHP_SITE)) php-source: $(DL_DIR)/$(PHP_SOURCE) diff --git a/package/pkgconfig/pkgconfig.mk b/package/pkgconfig/pkgconfig.mk index da7702450..19148f091 100644 --- a/package/pkgconfig/pkgconfig.mk +++ b/package/pkgconfig/pkgconfig.mk @@ -12,7 +12,7 @@ PKGCONFIG_BINARY:=pkg-config PKGCONFIG_TARGET_BINARY:=usr/bin/pkg-config $(DL_DIR)/$(PKGCONFIG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKGCONFIG_SITE)/$(PKGCONFIG_SOURCE) + $(call DOWNLOAD,$(PKGCONFIG_SITE),$(PKGCONFIG_SOURCE)) pkgconfig-source: $(DL_DIR)/$(PKGCONFIG_SOURCE) diff --git a/package/portage/portage.mk b/package/portage/portage.mk index ec1452e60..a4d6b9d89 100644 --- a/package/portage/portage.mk +++ b/package/portage/portage.mk @@ -51,10 +51,10 @@ ifeq ($(PORTAGE_ARCH),) endif $(DL_DIR)/$(PORTAGE_SOURCE): - $(WGET) -P $(DL_DIR) $(PORTAGE_SITE)/$(PORTAGE_SOURCE) + $(call DOWNLOAD,$(PORTAGE_SITE),$(PORTAGE_SOURCE)) $(DL_DIR)/$(SANDBOX_SOURCE): - $(WGET) -P $(DL_DIR) $(SANDBOX_SITE)/$(SANDBOX_SOURCE) + $(call DOWNLOAD,$(SANDBOX_SITE),$(SANDBOX_SOURCE)) portage-source: $(DL_DIR)/$(PORTAGE_SOURCE) sandbox-source: $(DL_DIR)/$(SANDBOX_SOURCE) @@ -65,7 +65,7 @@ $(PORTAGE_DOWNLOAD_DIR)/.unpacked: $(DL_DIR)/$(PORTAGE_SOURCE) ifeq ($(PORTAGE_PATCH_APPLY),y) $(DL_DIR)/$(PORTAGE_PATCH): - $(WGET) -P $(DL_DIR) $(PORTAGE_SITE)/$(PORTAGE_PATCH) + $(call DOWNLOAD,$(PORTAGE_SITE),$(PORTAGE_PATCH)) $(PORTAGE_DIR)/.patched: $(PORTAGE_DOWNLOAD_DIR)/.unpacked $(DL_DIR)/$(PORTAGE_PATCH) mv -f $(BUILD_DIR)/portage-$(PORTAGE_DOWNLOAD_VERSION) $(PORTAGE_DIR) diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk index 5ce931672..94d9c022d 100644 --- a/package/portmap/portmap.mk +++ b/package/portmap/portmap.mk @@ -12,7 +12,7 @@ PORTMAP_BINARY:=portmap PORTMAP_TARGET_BINARY:=sbin/portmap $(DL_DIR)/$(PORTMAP_SOURCE): - $(WGET) -P $(DL_DIR) $(PORTMAP_SITE)/$(PORTMAP_SOURCE) + $(call DOWNLOAD,$(PORTMAP_SITE),$(PORTMAP_SOURCE)) portmap-source: $(DL_DIR)/$(PORTMAP_SOURCE) diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk index c428363ff..abe26649d 100644 --- a/package/pppd/pppd.mk +++ b/package/pppd/pppd.mk @@ -13,7 +13,7 @@ PPPD_TARGET_BINARY:=usr/sbin/pppd $(DL_DIR)/$(PPPD_SOURCE): - $(WGET) -P $(DL_DIR) $(PPPD_SITE)/$(PPPD_SOURCE) + $(call DOWNLOAD,$(PPPD_SITE),$(PPPD_SOURCE)) pppd-source: $(DL_DIR)/$(PPPD_SOURCE) diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk index 78dd25afa..5b1b1f321 100644 --- a/package/pptp-linux/pptp-linux.mk +++ b/package/pptp-linux/pptp-linux.mk @@ -13,12 +13,12 @@ PPTP_LINUX_BINARY:=pptp PPTP_LINUX_TARGET_BINARY:=usr/sbin/pptp $(DL_DIR)/$(PPTP_LINUX_SOURCE): - $(WGET) -P $(DL_DIR) $(PPTP_LINUX_SITE)/$(PPTP_LINUX_SOURCE) + $(call DOWNLOAD,$(PPTP_LINUX_SITE),$(PPTP_LINUX_SOURCE)) ifneq ($(PPTP_LINUX_PATCH),) PPTP_LINUX_PATCH_FILE:=$(DL_DIR)/$(PPTP_LINUX_PATCH) $(PPTP_LINUX_PATCH_FILE): - $(WGET) -P $(DL_DIR) $(PPTP_LINUX_SITE)/$(PPTP_LINUX_PATCH) + $(call DOWNLOAD,$(PPTP_LINUX_SITE),$(PPTP_LINUX_PATCH)) endif $(PPTP_LINUX_DIR)/.unpacked: $(DL_DIR)/$(PPTP_LINUX_SOURCE) $(PPTP_LINUX_PATCH_FILE) diff --git a/package/procps/procps.mk b/package/procps/procps.mk index fe8a55fdb..86ca30e48 100644 --- a/package/procps/procps.mk +++ b/package/procps/procps.mk @@ -11,7 +11,7 @@ PROCPS_BINARY:=ps/ps PROCPS_TARGET_BINARY:=usr/bin/vmstat $(DL_DIR)/$(PROCPS_SOURCE): - $(WGET) -P $(DL_DIR) $(PROCPS_SITE)/$(PROCPS_SOURCE) + $(call DOWNLOAD,$(PROCPS_SITE),$(PROCPS_SOURCE)) $(PROCPS_DIR)/.source: $(DL_DIR)/$(PROCPS_SOURCE) $(ZCAT) $(DL_DIR)/$(PROCPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk index cdae13621..3773a621d 100644 --- a/package/proftpd/proftpd.mk +++ b/package/proftpd/proftpd.mk @@ -16,7 +16,7 @@ ENABLE_IPV6:=--enable-ipv6 endif $(DL_DIR)/$(PROFTPD_SOURCE): - $(WGET) -P $(DL_DIR) $(PROFTPD_SITE)/$(PROFTPD_SOURCE) + $(call DOWNLOAD,$(PROFTPD_SITE),$(PROFTPD_SOURCE)) proftpd-source: $(DL_DIR)/$(PROFTPD_SOURCE) diff --git a/package/python/python.mk b/package/python/python.mk index 9bbab3503..d775cce3f 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -69,7 +69,7 @@ BR2_PYTHON_DISABLED_MODULES += unicodedata endif $(DL_DIR)/$(PYTHON_SOURCE): - $(WGET) -P $(DL_DIR) $(PYTHON_SITE)/$(PYTHON_SOURCE) + $(call DOWNLOAD,$(PYTHON_SITE),$(PYTHON_SOURCE)) python-source: $(DL_DIR)/$(PYTHON_SOURCE) diff --git a/package/qte/qte.mk b/package/qte/qte.mk index 092144390..6b61b07b5 100644 --- a/package/qte/qte.mk +++ b/package/qte/qte.mk @@ -100,11 +100,11 @@ QTE_QTOPIA_CONFIGURE:=$(QTE_QTOPIA_CONFIGURE) -L $(E2FSPROGS_DIR)/lib -I $(E2FSP ifneq ($(BR2_QTE_C_QTE_VERSION),$(BR2_QTE_C_QT3_VERSION)) $(DL_DIR)/$(QTE_QT3_SOURCE): - $(WGET) -P $(DL_DIR) $(QTE_SITE)/$(@F) + $(call DOWNLOAD,$(QTE_SITE),$(@F)) endif $(DL_DIR)/$(QTE_QTE_SOURCE) $(DL_DIR)/$(QTE_QVFB_SOURCE) $(DL_DIR)/$(QTE_QTOPIA_SOURCE): - $(WGET) -P $(DL_DIR) $(QTE_SITE)/$(@F) + $(call DOWNLOAD,$(QTE_SITE),$(@F)) $(QTE_TMAKE_DIR)/.unpacked: $(DL_DIR)/$(QTE_TMAKE_SOURCE) $(QTE_CAT) $(DL_DIR)/$(QTE_TMAKE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index 8c3e487b5..fd7cb8b1d 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -292,7 +292,7 @@ QTOPIA4_QMAKE_CONF:=$(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++ $(DL_DIR)/$(QTOPIA4_SOURCE): - $(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE) + $(call DOWNLOAD,$(QTOPIA4_SITE),$(QTOPIA4_SOURCE)) qtopia4-source: $(DL_DIR)/$(QTOPIA4_SOURCE) diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 0103d6b2b..2473bcf3e 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -115,12 +115,12 @@ QUAGGA_CONFIGURE+=$(subst ",,$(BR2_PACKAGE_QUAGGA_CONFIGURE)) # ") $(DL_DIR)/$(QUAGGA_SOURCE): - $(WGET) -P $(DL_DIR) $(QUAGGA_SITE)/$(QUAGGA_SOURCE) + $(call DOWNLOAD,$(QUAGGA_SITE),$(QUAGGA_SOURCE)) ifneq ($(QUAGGA_PATCH),) QUAGGA_PATCH_FILE=$(DL_DIR)/$(QUAGGA_PATCH) $(DL_DIR)/$(QUAGGA_PATCH): - $(WGET) -P $(DL_DIR) $(QUAGGA_SITE)/$(QUAGGA_PATCH) + $(call DOWNLOAD,$(QUAGGA_SITE),$(QUAGGA_PATCH)) endif quagga-source: $(DL_DIR)/$(QUAGGA_SOURCE) $(QUAGGA_PATCH_FILE) diff --git a/package/raidtools2/raidtools2.mk b/package/raidtools2/raidtools2.mk index d8a1cf931..5cddd1b3c 100644 --- a/package/raidtools2/raidtools2.mk +++ b/package/raidtools2/raidtools2.mk @@ -12,7 +12,7 @@ RAIDTOOLS2_BINARY:=mkraid RAIDTOOLS2_TARGET_BINARY:=sbin/mkraid $(DL_DIR)/$(RAIDTOOLS2_SOURCE): - $(WGET) -P $(DL_DIR) $(RAIDTOOLS2_SITE)/$(RAIDTOOLS2_SOURCE) + $(call DOWNLOAD,$(RAIDTOOLS2_SITE),$(RAIDTOOLS2_SOURCE)) raidtools2-source: $(DL_DIR)/$(RAIDTOOLS2_SOURCE) diff --git a/package/rdesktop/rdesktop.mk b/package/rdesktop/rdesktop.mk index 781658eec..63be0b8b5 100644 --- a/package/rdesktop/rdesktop.mk +++ b/package/rdesktop/rdesktop.mk @@ -11,7 +11,7 @@ RDESKTOP_DIR=$(BUILD_DIR)/rdesktop-$(RDESKTOP_VERSION) RDESKTOP_CAT:=$(ZCAT) $(DL_DIR)/$(RDESKTOP_SOURCE): - $(WGET) -P $(DL_DIR) $(RDESKTOP_SITE)/$(RDESKTOP_SOURCE) + $(call DOWNLOAD,$(RDESKTOP_SITE),$(RDESKTOP_SOURCE)) $(RDESKTOP_DIR)/.unpacked: $(DL_DIR)/$(RDESKTOP_SOURCE) $(RDESKTOP_CAT) $(DL_DIR)/$(RDESKTOP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 635d75944..612275c33 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -14,7 +14,7 @@ READLINE_TARGET_BINARY:=usr/lib/$(READLINE_BINARY) READLINE_TARGET_SHARED_BINARY:=usr/lib/$(READLINE_SHARED_BINARY) $(DL_DIR)/$(READLINE_SOURCE): - $(WGET) -P $(DL_DIR) $(READLINE_SITE)/$(READLINE_SOURCE) + $(call DOWNLOAD,$(READLINE_SITE),$(READLINE_SOURCE)) readline-source: $(DL_DIR)/$(READLINE_SOURCE) diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk index b788ebd06..2ca463e56 100644 --- a/package/rp-pppoe/rp-pppoe.mk +++ b/package/rp-pppoe/rp-pppoe.mk @@ -14,12 +14,12 @@ RP_PPPOE_BINARY:=pppoe RP_PPPOE_TARGET_BINARY:=usr/sbin/pppoe $(DL_DIR)/$(RP_PPPOE_SOURCE): - $(WGET) -P $(DL_DIR) $(RP_PPPOE_SITE)/$(RP_PPPOE_SOURCE) + $(call DOWNLOAD,$(RP_PPPOE_SITE),$(RP_PPPOE_SOURCE)) ifneq ($(RP_PPPOE_PATCH),) RP_PPPOE_PATCH_FILE:=$(DL_DIR)/$(RP_PPPOE_PATCH) $(RP_PPPOE_PATCH_FILE): - $(WGET) -P $(DL_DIR) $(RP_PPPOE_SITE)/$(RP_PPPOE_PATCH) + $(call DOWNLOAD,$(RP_PPPOE_SITE),$(RP_PPPOE_PATCH)) endif $(RP_PPPOE_TOPDIR)/.unpacked: $(DL_DIR)/$(RP_PPPOE_SOURCE) $(RP_PPPOE_PATCH_FILE) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index d3a058d4d..c7dc31fc3 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -12,7 +12,7 @@ RUBY_BINARY:=ruby RUBY_TARGET_BINARY:=usr/bin/ruby $(DL_DIR)/$(RUBY_SOURCE): - $(WGET) -P $(DL_DIR) $(RUBY_SITE)/$(RUBY_SOURCE) + $(call DOWNLOAD,$(RUBY_SITE),$(RUBY_SOURCE)) ruby-source: $(DL_DIR)/$(RUBY_SOURCE) diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index e28d7dfc7..1a0a82636 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -28,7 +28,7 @@ RXVT_DIR:=$(BUILD_DIR)/rxvt-$(RXVT_VERSION) RXVT_BINARY:=$(RXVT_DIR)/src/rxvt $(DL_DIR)/$(RXVT_SOURCE): - $(WGET) -P $(DL_DIR) $(RXVT_SITE)/$(RXVT_SOURCE) + $(call DOWNLOAD,$(RXVT_SITE),$(RXVT_SOURCE)) rxvt-source: $(DL_DIR)/$(RXVT_SOURCE) diff --git a/package/samba/samba.mk b/package/samba/samba.mk index d277d2354..83e078be1 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -12,7 +12,7 @@ SAMBA_BINARY:=bin/smbd SAMBA_TARGET_BINARY:=usr/sbin/smbd $(DL_DIR)/$(SAMBA_SOURCE): - $(WGET) -P $(DL_DIR) $(SAMBA_SITE)/$(SAMBA_SOURCE) + $(call DOWNLOAD,$(SAMBA_SITE),$(SAMBA_SOURCE)) $(SAMBA_DIR)/.unpacked: $(DL_DIR)/$(SAMBA_SOURCE) $(SAMBA_CAT) $(DL_DIR)/$(SAMBA_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 6e8f2dd61..0ab02100b 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -39,7 +39,7 @@ SDL_X11=--enable-video-x11=no endif $(DL_DIR)/$(SDL_SOURCE): - $(WGET) -P $(DL_DIR) $(SDL_SITE)/$(SDL_SOURCE) + $(call DOWNLOAD,$(SDL_SITE),$(SDL_SOURCE)) sdl-source: $(DL_DIR)/$(SDL_SOURCE) diff --git a/package/sdl_mixer/sdl_mixer.mk b/package/sdl_mixer/sdl_mixer.mk index 76189e815..ab8b59181 100644 --- a/package/sdl_mixer/sdl_mixer.mk +++ b/package/sdl_mixer/sdl_mixer.mk @@ -10,7 +10,7 @@ SDL_MIXER_CAT:=$(ZCAT) SDL_MIXER_DIR:=$(BUILD_DIR)/SDL_mixer-$(SDL_MIXER_VERSION) $(DL_DIR)/$(SDL_MIXER_SOURCE): - $(WGET) -P $(DL_DIR) $(SDL_MIXER_SITE)/$(SDL_MIXER_SOURCE) + $(call DOWNLOAD,$(SDL_MIXER_SITE),$(SDL_MIXER_SOURCE)) sdl_mixer-source: $(DL_DIR)/$(SDL_MIXER_SOURCE) diff --git a/package/sdl_ttf/sdl_ttf.mk b/package/sdl_ttf/sdl_ttf.mk index a0b8579cb..45d63ca51 100644 --- a/package/sdl_ttf/sdl_ttf.mk +++ b/package/sdl_ttf/sdl_ttf.mk @@ -10,7 +10,7 @@ SDL_TTF_CAT:=$(ZCAT) SDL_TTF_DIR:=$(BUILD_DIR)/SDL_ttf-$(SDL_TTF_VERSION) $(DL_DIR)/$(SDL_TTF_SOURCE): - $(WGET) -P $(DL_DIR) $(SDL_TTF_SITE)/$(SDL_TTF_SOURCE) + $(call DOWNLOAD,$(SDL_TTF_SITE),$(SDL_TTF_SOURCE)) sdl_ttf-source: $(DL_DIR)/$(SDL_TTF_SOURCE) diff --git a/package/sed/sed.mk b/package/sed/sed.mk index 823d037a9..9caefed49 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -22,7 +22,7 @@ HOST_SED_IF_ANY=$(shell toolchain/dependencies/check-host-sed.sh) $(DL_DIR)/$(SED_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE) + $(call DOWNLOAD,$(SED_SITE),$(SED_SOURCE)) sed-source: $(DL_DIR)/$(SED_SOURCE) diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk index 19bed93b6..394ae4637 100644 --- a/package/setserial/setserial.mk +++ b/package/setserial/setserial.mk @@ -13,12 +13,12 @@ SETSERIAL_BINARY:=setserial SETSERIAL_TARGET_BINARY:=usr/bin/setserial $(DL_DIR)/$(SETSERIAL_SOURCE): - $(WGET) -P $(DL_DIR) $(SETSERIAL_SITE)/$(SETSERIAL_SOURCE) + $(call DOWNLOAD,$(SETSERIAL_SITE),$(SETSERIAL_SOURCE)) ifneq ($(SETSERIAL_PATCH_FILE),) SETSERIAL_PATCH:=$(DL_DIR)/$(SETSERIAL_PATCH_FILE) $(SETSERIAL_PATCH): - $(WGET) -O $@ $(SETSERIAL_SITE)/$(SETSERIAL_PATCH_FILE) + $(WGET) -O $@ $(SETSERIAL_SITE),$(SETSERIAL_PATCH_FILE) else SETSERIAL_PATCH:= endif diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk index 691d11410..e91d06a5c 100644 --- a/package/sfdisk/sfdisk.mk +++ b/package/sfdisk/sfdisk.mk @@ -10,7 +10,7 @@ SFDISK_SITE:=http://www.uclibc.org/ SFDISK_DIR=$(BUILD_DIR)/sfdisk$(SFDISK_VERSION) $(DL_DIR)/$(SFDISK_SOURCE): - $(WGET) -P $(DL_DIR) $(SFDISK_SITE)/$(SFDISK_SOURCE) + $(call DOWNLOAD,$(SFDISK_SITE),$(SFDISK_SOURCE)) $(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE) $(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/slang/slang.mk b/package/slang/slang.mk index 3b7869557..e1f6c2872 100644 --- a/package/slang/slang.mk +++ b/package/slang/slang.mk @@ -10,7 +10,7 @@ SLANG_SITE:=http://www.uclibc.org/ SLANG_DIR=$(BUILD_DIR)/slang-$(SLANG_VERSION)-mini $(DL_DIR)/$(SLANG_SOURCE): - $(WGET) -P $(DL_DIR) $(SLANG_SITE)/$(SLANG_SOURCE) + $(call DOWNLOAD,$(SLANG_SITE),$(SLANG_SOURCE)) $(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE) $(SLANG_CAT) $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/smartmontools/smartmontools.mk b/package/smartmontools/smartmontools.mk index 6a936d1f2..bf2b1fe12 100644 --- a/package/smartmontools/smartmontools.mk +++ b/package/smartmontools/smartmontools.mk @@ -14,7 +14,7 @@ SMARTMONTOOLS_TARGET_BINARY:=usr/sbin/smartctl SMARTMONTOOLS_TARGET_BINARY2:=usr/sbin/smartd $(DL_DIR)/$(SMARTMONTOOLS_SOURCE): - $(WGET) -P $(DL_DIR) $(SMARTMONTOOLS_SITE)/$(SMARTMONTOOLS_SOURCE) + $(call DOWNLOAD,$(SMARTMONTOOLS_SITE),$(SMARTMONTOOLS_SOURCE)) smartmontools-source: $(DL_DIR)/$(SMARTMONTOOLS_SOURCE) diff --git a/package/socat/socat.mk b/package/socat/socat.mk index ebaea6b55..d45b30660 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -40,7 +40,7 @@ SOCAT_CONFIGURE_OPTS += sc_cv_sys_csize_shift=$(CSIZE_SHIFT) endif $(DL_DIR)/$(SOCAT_SOURCE): - $(WGET) -P $(DL_DIR) $(SOCAT_SITE)/$(SOCAT_SOURCE) + $(call DOWNLOAD,$(SOCAT_SITE),$(SOCAT_SOURCE)) $(SOCAT_DIR)/.unpacked: $(DL_DIR)/$(SOCAT_SOURCE) $(SOCAT_CAT) $(DL_DIR)/$(SOCAT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 258c173ac..779af0ef2 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -10,7 +10,7 @@ STUNNEL_CAT:=$(ZCAT) STUNNEL_DIR:=$(BUILD_DIR)/stunnel-$(STUNNEL_VERSION) $(DL_DIR)/$(STUNNEL_SOURCE): - $(WGET) -P $(DL_DIR) $(STUNNEL_SITE)/$(STUNNEL_SOURCE) + $(call DOWNLOAD,$(STUNNEL_SITE),$(STUNNEL_SOURCE)) stunnel-source: $(DL_DIR)/$(STUNNEL_SOURCE) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 2ac3625cb..0138373ca 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -17,7 +17,7 @@ SUDO_DIR:=$(BUILD_DIR)/sudo-$(SUDO_VERSION) SUDO_UNZIP:=$(ZCAT) $(DL_DIR)/$(SUDO_SOURCE): - $(WGET) -P $(DL_DIR) $(SUDO_SITE)/$(SUDO_SOURCE) + $(call DOWNLOAD,$(SUDO_SITE),$(SUDO_SOURCE)) sudo-source: $(DL_DIR)/$(SUDO_SOURCE) $(SUDO_CONFIG_FILE) diff --git a/package/sysklogd/sysklogd.mk b/package/sysklogd/sysklogd.mk index 2eddc321c..d967db10a 100644 --- a/package/sysklogd/sysklogd.mk +++ b/package/sysklogd/sysklogd.mk @@ -15,7 +15,7 @@ SYSKLOGD_KLOGD_TARGET_BINARY:=sbin/klogd SYSKLOGD_TARGET_BINARY:=$(SYSKLOGD_KLOGD_TARGET_BINARY) $(DL_DIR)/$(SYSKLOGD_SOURCE): - $(WGET) -P $(DL_DIR) $(SYSKLOGD_SITE)/$(SYSKLOGD_SOURCE) + $(call DOWNLOAD,$(SYSKLOGD_SITE),$(SYSKLOGD_SOURCE)) sysklogd-source: $(DL_DIR)/$(SYSKLOGD_SOURCE) diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index 055206f5d..c3ded2dcb 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -12,7 +12,7 @@ SYSVINIT_BINARY:=src/init SYSVINIT_TARGET_BINARY:=sbin/init $(DL_DIR)/$(SYSVINIT_SOURCE): - $(WGET) -P $(DL_DIR) $(SYSVINIT_SITE)/$(SYSVINIT_SOURCE) + $(call DOWNLOAD,$(SYSVINIT_SITE),$(SYSVINIT_SOURCE)) sysvinit-unpacked: $(SYSVINIT_DIR)/.unpacked $(SYSVINIT_DIR)/.unpacked: $(DL_DIR)/$(SYSVINIT_SOURCE) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index 1b3ff4835..640868c28 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -12,7 +12,7 @@ GNUTAR_BINARY:=src/tar GNUTAR_TARGET_BINARY:=bin/tar $(DL_DIR)/$(GNUTAR_SOURCE): - $(WGET) -P $(DL_DIR) $(GNUTAR_SITE)/$(GNUTAR_SOURCE) + $(call DOWNLOAD,$(GNUTAR_SITE),$(GNUTAR_SOURCE)) tar-source: $(DL_DIR)/$(GNUTAR_SOURCE) diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index bd046f533..d5278aa66 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -9,7 +9,7 @@ TCL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl TCL_DIR:=$(BUILD_DIR)/tcl$(TCL_VERSION) $(DL_DIR)/$(TCL_SOURCE): - $(WGET) -P $(DL_DIR) $(TCL_SITE)/$(TCL_SOURCE) + $(call DOWNLOAD,$(TCL_SITE),$(TCL_SOURCE)) $(TCL_DIR)/.source: $(DL_DIR)/$(TCL_SOURCE) $(ZCAT) $(DL_DIR)/$(TCL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/tcpdump/dhcpdump.mk b/package/tcpdump/dhcpdump.mk index a7c22fb5b..bb798bd5a 100644 --- a/package/tcpdump/dhcpdump.mk +++ b/package/tcpdump/dhcpdump.mk @@ -13,7 +13,7 @@ DHCPDUMP_SOURCE:=dhcpdump-$(DHCPDUMP_VERSION).tar.gz DHCPDUMP_CAT:=$(ZCAT) $(DL_DIR)/$(DHCPDUMP_SOURCE): - $(WGET) -P $(DL_DIR) $(DHCPDUMP_SITE)/$(DHCPDUMP_SOURCE) + $(call DOWNLOAD,$(DHCPDUMP_SITE),$(DHCPDUMP_SOURCE)) dhcpdump-source: $(DL_DIR)/$(DHCPDUMP_SOURCE) diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 011218163..8ced860bf 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -19,7 +19,7 @@ TCPDUMP_ENABLE_SMB:=--enable-smb endif $(DL_DIR)/$(TCPDUMP_SOURCE): - $(WGET) -P $(DL_DIR) $(TCPDUMP_SITE)/$(TCPDUMP_SOURCE) + $(call DOWNLOAD,$(TCPDUMP_SITE),$(TCPDUMP_SOURCE)) tcpdump-source: $(DL_DIR)/$(TCPDUMP_SOURCE) diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk index c9dbedfd3..621961c4f 100644 --- a/package/tftpd/tftpd.mk +++ b/package/tftpd/tftpd.mk @@ -12,7 +12,7 @@ TFTP_HPA_BINARY:=tftpd/tftpd TFTP_HPA_TARGET_BINARY:=usr/sbin/in.tftpd $(DL_DIR)/$(TFTP_HPA_SOURCE): - $(WGET) -P $(DL_DIR) $(TFTP_HPA_SITE)/$(TFTP_HPA_SOURCE) + $(call DOWNLOAD,$(TFTP_HPA_SITE),$(TFTP_HPA_SOURCE)) tftpd-source: $(DL_DIR)/$(TFTP_HPA_SOURCE) diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index a4685c8be..2d71703df 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -14,7 +14,7 @@ THTTPD_ROOT:=/var THTTPD_WEB_DIR:=$(THTTPD_ROOT)/www $(DL_DIR)/$(THTTPD_SOURCE): - $(WGET) -P $(DL_DIR) $(THTTPD_SITE)/$(THTTPD_SOURCE) + $(call DOWNLOAD,$(THTTPD_SITE),$(THTTPD_SOURCE)) thttpd-source: $(DL_DIR)/$(THTTPD_SOURCE) diff --git a/package/tinyhttpd/tinyhttpd.mk b/package/tinyhttpd/tinyhttpd.mk index e17b10507..90274a7df 100644 --- a/package/tinyhttpd/tinyhttpd.mk +++ b/package/tinyhttpd/tinyhttpd.mk @@ -12,7 +12,7 @@ TINYHTTPD_BINARY:=httpd TINYHTTPD_TARGET_BINARY:=usr/sbin/tinyhttpd $(DL_DIR)/$(TINYHTTPD_SOURCE): - $(WGET) -P $(DL_DIR) $(TINYHTTPD_SITE)/$(TINYHTTPD_SOURCE) + $(call DOWNLOAD,$(TINYHTTPD_SITE),$(TINYHTTPD_SOURCE)) tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE) diff --git a/package/tinylogin/tinylogin.mk b/package/tinylogin/tinylogin.mk index 30b64d1ac..ce847bfb5 100644 --- a/package/tinylogin/tinylogin.mk +++ b/package/tinylogin/tinylogin.mk @@ -20,7 +20,7 @@ endif TINYLOGIN_CAT:=$(BZCAT) $(DL_DIR)/$(TINYLOGIN_SOURCE): - $(WGET) -P $(DL_DIR) $(TINYLOGIN_SITE)/$(TINYLOGIN_SOURCE) + $(call DOWNLOAD,$(TINYLOGIN_SITE),$(TINYLOGIN_SOURCE)) tinylogin-source: $(DL_DIR)/$(TINYLOGIN_SOURCE) diff --git a/package/tn5250/tn5250.mk b/package/tn5250/tn5250.mk index 39a23dc76..218421052 100644 --- a/package/tn5250/tn5250.mk +++ b/package/tn5250/tn5250.mk @@ -5,7 +5,7 @@ TN5250_SOURCE:=tn5250-$(TN5250_VERSION).tar.gz TN5250_CAT:=$(ZCAT) $(DL_DIR)/$(TN5250_SOURCE): - $(WGET) -P $(DL_DIR) $(TN5250_SITE)/$(TN5250_SOURCE) + $(call DOWNLOAD,$(TN5250_SITE),$(TN5250_SOURCE)) $(TN5250_DIR)/.dist: $(DL_DIR)/$(TN5250_SOURCE) $(TN5250_CAT) $(DL_DIR)/$(TN5250_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 69b132df9..5c7b22c9d 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -10,7 +10,7 @@ TSLIB_CAT:=$(BZCAT) TSLIB_DIR:=$(BUILD_DIR)/tslib-$(TSLIB_VERSION) $(DL_DIR)/$(TSLIB_SOURCE): - $(WGET) -P $(DL_DIR) $(TSLIB_SITE)/$(TSLIB_SOURCE) + $(call DOWNLOAD,$(TSLIB_SITE),$(TSLIB_SOURCE)) tslib-source: $(DL_DIR)/$(TSLIB_SOURCE) diff --git a/package/ttcp/ttcp.mk b/package/ttcp/ttcp.mk index 459595028..1c4fe6ff1 100644 --- a/package/ttcp/ttcp.mk +++ b/package/ttcp/ttcp.mk @@ -10,7 +10,7 @@ TTCP_SOURCE=ttcp$(TTCP_VERSION).c TTCP_DIR=$(BUILD_DIR)/ttcp$(TTCP_VERSION) $(DL_DIR)/$(TTCP_SOURCE): - $(WGET) -P $(DL_DIR) $(TTCP_SOURCE_URL)/$(TTCP_SOURCE) + $(call DOWNLOAD,$(TTCP_SOURCE_URL),$(TTCP_SOURCE)) $(TTCP_DIR)/.unpacked: $(DL_DIR)/$(TTCP_SOURCE) -mkdir $(TTCP_DIR) diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 0431e8faf..434ade234 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -25,7 +25,7 @@ endif UDEV_ROOT:=/dev $(DL_DIR)/$(UDEV_SOURCE): - $(WGET) -P $(DL_DIR) $(UDEV_SITE)/$(UDEV_SOURCE) + $(call DOWNLOAD,$(UDEV_SITE),$(UDEV_SOURCE)) $(UDEV_DIR)/.unpacked: $(DL_DIR)/$(UDEV_SOURCE) $(UDEV_CAT) $(DL_DIR)/$(UDEV_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/udhcp/udhcp.mk b/package/udhcp/udhcp.mk index 8faf58217..1af010087 100644 --- a/package/udhcp/udhcp.mk +++ b/package/udhcp/udhcp.mk @@ -26,7 +26,7 @@ UDHCP_SITE:=http://udhcp.busybox.net/downloads/ UDHCP_DIR:=$(BUILD_DIR)/udhcp-$(UDHCP_VERSION) $(DL_DIR)/$(UDHCP_SOURCE): - $(WGET) -P $(DL_DIR) $(UDHCP_SITE)/$(UDHCP_SOURCE) + $(call DOWNLOAD,$(UDHCP_SITE),$(UDHCP_SOURCE)) udhcp-source: $(DL_DIR)/$(UDHCP_SOURCE) diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk index b19f926e7..4981f51f6 100644 --- a/package/udpcast/udpcast.mk +++ b/package/udpcast/udpcast.mk @@ -12,7 +12,7 @@ UDPCAST_DIR:=$(BUILD_DIR)/udpcast-$(UDPCAST_VERSION) BR2_UDPCAST_CFLAGS:= $(DL_DIR)/$(UDPCAST_SOURCE): - $(WGET) -P $(DL_DIR) $(UDPCAST_SITE)/$(UDPCAST_SOURCE) + $(call DOWNLOAD,$(UDPCAST_SITE),$(UDPCAST_SOURCE)) udpcast-source: $(DL_DIR)/$(UDPCAST_SOURCE) diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk index 705b74507..726abd22a 100644 --- a/package/usbmount/usbmount.mk +++ b/package/usbmount/usbmount.mk @@ -12,7 +12,7 @@ USBMOUNT_BINARY:=usbmount USBMOUNT_TARGET_BINARY:=sbin/usbmount $(DL_DIR)/$(USBMOUNT_SOURCE): - $(WGET) -P $(DL_DIR) $(USBMOUNT_SITE)/$(USBMOUNT_SOURCE) + $(call DOWNLOAD,$(USBMOUNT_SITE),$(USBMOUNT_SOURCE)) usbmount-source: $(DL_DIR)/$(USBMOUNT_SOURCE) diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 497cb218d..39393b562 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -12,7 +12,7 @@ USBUTILS_BINARY:=lsusb USBUTILS_TARGET_BINARY:=usr/sbin/lsusb $(DL_DIR)/$(USBUTILS_SOURCE): - $(WGET) -P $(DL_DIR) $(USBUTILS_SITE)/$(USBUTILS_SOURCE) + $(call DOWNLOAD,$(USBUTILS_SITE),$(USBUTILS_SOURCE)) usbutils-source: $(DL_DIR)/$(USBUTILS_SOURCE) diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 4cb0e71ed..cf8093afd 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -12,7 +12,7 @@ UTIL-LINUX_BINARY:=$(UTIL-LINUX_DIR)/misc-utils/chkdupexe UTIL-LINUX_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/chkdupexe $(DL_DIR)/$(UTIL-LINUX_SOURCE): - $(WGET) -P $(DL_DIR) $(UTIL-LINUX_SITE)/$(UTIL-LINUX_SOURCE) + $(call DOWNLOAD,$(UTIL-LINUX_SITE),$(UTIL-LINUX_SOURCE)) $(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE) $(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index d0640a40e..a156c9b2a 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -11,7 +11,7 @@ VALGRIND_SOURCE:=valgrind-$(VALGRIND_VERSION).tar.bz2 VALGRIND_CAT:=$(BZCAT) $(DL_DIR)/$(VALGRIND_SOURCE): - $(WGET) -P $(DL_DIR) $(VALGRIND_SITE)/$(VALGRIND_SOURCE) + $(call DOWNLOAD,$(VALGRIND_SITE),$(VALGRIND_SOURCE)) $(VALGRIND_DIR)/.unpacked: $(DL_DIR)/$(VALGRIND_SOURCE) $(VALGRIND_CAT) $(DL_DIR)/$(VALGRIND_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/vpnc/vpnc.mk b/package/vpnc/vpnc.mk index 93f7eec1c..a94208f99 100644 --- a/package/vpnc/vpnc.mk +++ b/package/vpnc/vpnc.mk @@ -15,7 +15,7 @@ VPNC_TARGET_BINARY:=$(VPNC_DEST_DIR)/vpnc VPNC_TARGET_SCRIPT:=$(TARGET_DIR)/etc/vpnc/default.conf $(DL_DIR)/$(VPNC_SOURCE): - $(WGET) -P $(DL_DIR) $(VPNC_SITE)/$(VPNC_SOURCE) + $(call DOWNLOAD,$(VPNC_SITE),$(VPNC_SOURCE)) $(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE) $(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/vsftpd/vsftpd.mk b/package/vsftpd/vsftpd.mk index c1cca563c..f845aeddc 100644 --- a/package/vsftpd/vsftpd.mk +++ b/package/vsftpd/vsftpd.mk @@ -18,7 +18,7 @@ VSFTPD_LIBS:=-lcrypt endif $(DL_DIR)/$(VSFTPD_SOURCE): - $(WGET) -P $(DL_DIR) $(VSFTPD_SITE)/$(VSFTPD_SOURCE) + $(call DOWNLOAD,$(VSFTPD_SITE),$(VSFTPD_SOURCE)) vsftpd-source: $(DL_DIR)/$(VSFTPD_SOURCE) diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index bd7382086..152ab9943 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -16,7 +16,7 @@ VTUN_BINARY:=vtund VTUN_TARGET_BINARY:=usr/sbin/vtund $(DL_DIR)/$(VTUN_SOURCE): - $(WGET) -P $(DL_DIR) $(VTUN_SITE)/$(VTUN_SOURCE) + $(call DOWNLOAD,$(VTUN_SITE),$(VTUN_SOURCE)) vtun-source: $(DL_DIR)/$(VTUN_SOURCE) diff --git a/package/wget/wget.mk b/package/wget/wget.mk index 3c56c8e59..080d370ed 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -12,7 +12,7 @@ WGET_BINARY:=src/wget WGET_TARGET_BINARY:=bin/wget $(DL_DIR)/$(WGET_SOURCE): - $(WGET) -P $(DL_DIR) $(WGET_SITE)/$(WGET_SOURCE) + $(call DOWNLOAD,$(WGET_SITE),$(WGET_SOURCE)) wget-source: $(DL_DIR)/$(WGET_SOURCE) diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk index deca74fb7..b3f92b13a 100644 --- a/package/wipe/wipe.mk +++ b/package/wipe/wipe.mk @@ -14,11 +14,11 @@ WIPE_BINARY:=wipe WIPE_TARGET_BINARY:=bin/wipe $(DL_DIR)/$(WIPE_SOURCE): - $(WGET) -P $(DL_DIR) $(WIPE_SITE)/$(WIPE_SOURCE) + $(call DOWNLOAD,$(WIPE_SITE),$(WIPE_SOURCE)) ifneq ($(WIPE_PATCH),) $(DL_DIR)/$(WIPE_PATCH): - $(WGET) -P $(DL_DIR) $(WIPE_SITE)/$(WIPE_PATCH) + $(call DOWNLOAD,$(WIPE_SITE),$(WIPE_PATCH)) endif wipe-source: $(DL_DIR)/$(WIPE_SOURCE) $(DL_DIR)/$(WIPE_PATCH) diff --git a/package/wireless-tools/wireless-tools.mk b/package/wireless-tools/wireless-tools.mk index b8c3f6946..b2cf2d996 100644 --- a/package/wireless-tools/wireless-tools.mk +++ b/package/wireless-tools/wireless-tools.mk @@ -16,7 +16,7 @@ WIRELESS_TOOLS_SOURCE:=wireless_tools.$(WIRELESS_TOOLS_VERSION)$(WIRELESS_TOOLS_ WIRELESS_TOOLS_BUILD_DIR=$(BUILD_DIR)/wireless_tools.$(WIRELESS_TOOLS_VERSION) $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE): - $(WGET) -P $(DL_DIR) $(WIRELESS_TOOLS_SOURCE_URL)/$(WIRELESS_TOOLS_SOURCE) + $(call DOWNLOAD,$(WIRELESS_TOOLS_SOURCE_URL),$(WIRELESS_TOOLS_SOURCE)) $(WIRELESS_TOOLS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE) $(ZCAT) $(DL_DIR)/$(WIRELESS_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk index e87af1645..15895d294 100644 --- a/package/x11r7/mesa3d/mesa3d.mk +++ b/package/x11r7/mesa3d/mesa3d.mk @@ -14,7 +14,7 @@ MESA_CONFIG_FILE=$(MESA3D_DIR)/configs/$(MESA_TARGET) MESA_DRIVERS= $(DL_DIR)/$(MESA3D_SOURCE): - $(WGET) -P $(DL_DIR) $(MESA3D_SITE)/$(MESA3D_SOURCE) + $(call DOWNLOAD,$(MESA3D_SITE),$(MESA3D_SOURCE)) $(MESA3D_DIR)/.extracted: $(DL_DIR)/$(MESA3D_SOURCE) $(ZCAT) $(DL_DIR)/$(MESA3D_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/x11r7/xapp_xman/xapp_xman.mk b/package/x11r7/xapp_xman/xapp_xman.mk index 492160442..49a24cd53 100644 --- a/package/x11r7/xapp_xman/xapp_xman.mk +++ b/package/x11r7/xapp_xman/xapp_xman.mk @@ -9,7 +9,7 @@ XAPP_XMAN_SITE:=http://xorg.freedesktop.org/releases/individual/app XAPP_XMAN_DIR:=$(BUILD_DIR)/xman-$(XAPP_XMAN_VERSION) $(DL_DIR)/$(XAPP_XMAN_SOURCE): - $(WGET) -P $(DL_DIR) $(XAPP_XMAN_SITE)/$(XAPP_XMAN_SOURCE) + $(call DOWNLOAD,$(XAPP_XMAN_SITE),$(XAPP_XMAN_SOURCE)) $(XAPP_XMAN_DIR)/.extracted: $(DL_DIR)/$(XAPP_XMAN_SOURCE) $(BZCAT) $(DL_DIR)/$(XAPP_XMAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index 111898c71..ccaec82aa 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -9,7 +9,7 @@ XDATA_XCURSOR_THEMES_SITE:=http://xorg.freedesktop.org/releases/individual/data XDATA_XCURSOR_THEMES_DIR:=$(BUILD_DIR)/xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION) $(DL_DIR)/$(XDATA_XCURSOR_THEMES_SOURCE): - $(WGET) -P $(DL_DIR) $(XDATA_XCURSOR_THEMES_SITE)/$(XDATA_XCURSOR_THEMES_SOURCE) + $(call DOWNLOAD,$(XDATA_XCURSOR_THEMES_SITE),$(XDATA_XCURSOR_THEMES_SOURCE)) $(XDATA_XCURSOR_THEMES_DIR)/.extracted: $(DL_DIR)/$(XDATA_XCURSOR_THEMES_SOURCE) $(BZCAT) $(DL_DIR)/$(XDATA_XCURSOR_THEMES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index 99b106189..addc0b6b2 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -13,7 +13,7 @@ XFONT_FONT_UTIL_DIR=$(BUILD_DIR)/$(XFONT_FONT_UTIL_NAME) XFONT_FONT_UTIL_CAT:=$(BZCAT) $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE): - $(WGET) -P $(DL_DIR) $(XFONT_FONT_UTIL_SITE)/$(XFONT_FONT_UTIL_SOURCE) + $(call DOWNLOAD,$(XFONT_FONT_UTIL_SITE),$(XFONT_FONT_UTIL_SOURCE)) xfont_font-util-source: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) diff --git a/package/xerces/xerces.mk b/package/xerces/xerces.mk index 8413c6540..292c515c5 100644 --- a/package/xerces/xerces.mk +++ b/package/xerces/xerces.mk @@ -11,7 +11,7 @@ XERCES_DIR:=$(BUILD_DIR)/xerces-c-src_2_7_0 XERCES_BINARY:=lib/libxerces-c.so.27.0 $(DL_DIR)/$(XERCES_SOURCE): - $(WGET) -P $(DL_DIR) $(XERCES_SITE)/$(XERCES_SOURCE) + $(call DOWNLOAD,$(XERCES_SITE),$(XERCES_SOURCE)) xerces-source: $(DL_DIR)/$(XERCES_SOURCE) diff --git a/package/xfsprogs/xfsprogs.mk b/package/xfsprogs/xfsprogs.mk index 33913a691..395e76470 100644 --- a/package/xfsprogs/xfsprogs.mk +++ b/package/xfsprogs/xfsprogs.mk @@ -19,7 +19,7 @@ XFSPROGS_STRIP_LIBDEP:= \ repair/xfs_repair quota/xfs_quota $(DL_DIR)/$(XFSPROGS_SOURCE): - $(WGET) -P $(DL_DIR) $(XFSPROGS_SITE)/$(XFSPROGS_SOURCE) + $(call DOWNLOAD,$(XFSPROGS_SITE),$(XFSPROGS_SOURCE)) xfsprogs-source: $(DL_DIR)/$(XFSPROGS_SOURCE) diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk index 739105118..c4da8d1ba 100644 --- a/package/zlib/zlib.mk +++ b/package/zlib/zlib.mk @@ -10,7 +10,7 @@ ZLIB_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/libpn ZLIB_DIR:=$(BUILD_DIR)/zlib-$(ZLIB_VERSION) $(DL_DIR)/$(ZLIB_SOURCE): - $(WGET) -P $(DL_DIR) $(ZLIB_SITE)/$(ZLIB_SOURCE) + $(call DOWNLOAD,$(ZLIB_SITE),$(ZLIB_SOURCE)) $(ZLIB_DIR)/.patched: $(DL_DIR)/$(ZLIB_SOURCE) $(ZLIB_CAT) $(DL_DIR)/$(ZLIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - |