From ed5f6093c0cf2b06b04e287a8cf0547440844733 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jan 2009 11:48:43 +0000 Subject: [PATCH] target/: convert to DOWNLOAD helper --- target/cloop/cloop.mk | 4 ++-- target/cramfs/cramfs.mk | 2 +- target/device/AMD/DBAu1500/linux26.mk | 2 +- target/device/Atmel/DataFlashBoot/DataflashBoot.mk | 2 +- target/device/Atmel/at91bootstrap/at91bootstrap.mk | 2 +- target/device/Atmel/u-boot/u-boot.mk | 4 ++-- target/device/Sharp/LNode80/linux.mk | 2 +- target/device/Soekris/net4521/linux.mk | 2 +- target/device/Soekris/soekris_gpio/soekris_gpio.mk | 2 +- target/device/Via/epia-mii/linux.mk | 2 +- target/device/jp/q5/linux.mk | 2 +- target/ext2/ext2root.mk | 2 +- target/iso9660/iso9660.mk | 2 +- target/powerpc/yaboot/yaboot.mk | 2 +- target/romfs/romfs.mk | 2 +- target/squashfs/squashfsroot.mk | 2 +- target/ubifs/ubifsroot.mk | 2 +- target/x86/grub/grub.mk | 4 ++-- target/x86/grub2/grub2.mk | 4 ++-- target/x86/syslinux/syslinux.mk | 2 +- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk index b099307e6f..9e31776227 100644 --- a/target/cloop/cloop.mk +++ b/target/cloop/cloop.mk @@ -11,10 +11,10 @@ CLOOP_SITE=http://debian-knoppix.alioth.debian.org/sources/ CLOOP_TARGET:=$(IMAGE).cloop ### Note: not used yet! ck ### $(DL_DIR)/$(CLOOP_PATCH1): -### $(WGET) -P $(DL_DIR) $(CLOOP_PATCH1_URL)/$(CLOOP_PATCH1) +### $(call DOWNLOAD,$(CLOOP_PATCH1_URL),$(CLOOP_PATCH1)) $(DL_DIR)/$(CLOOP_SOURCE): - $(WGET) -P $(DL_DIR) $(CLOOP_SITE)/$(CLOOP_SOURCE) + $(call DOWNLOAD,$(CLOOP_SITE),$(CLOOP_SOURCE)) $(CLOOP_DIR)/.unpacked: $(DL_DIR)/$(CLOOP_SOURCE) ### $(DL_DIR)/$(CLOOP_PATCH1) $(ZCAT) $(DL_DIR)/$(CLOOP_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk index 17a3f00b6b..34a54c43d5 100644 --- a/target/cramfs/cramfs.mk +++ b/target/cramfs/cramfs.mk @@ -14,7 +14,7 @@ CRAMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/cram endif $(DL_DIR)/$(CRAMFS_SOURCE): - $(WGET) -P $(DL_DIR) $(CRAMFS_SITE)/$(CRAMFS_SOURCE) + $(call DOWNLOAD,$(CRAMFS_SITE),$(CRAMFS_SOURCE)) $(CRAMFS_DIR): $(DL_DIR)/$(CRAMFS_SOURCE) $(ZCAT) $(DL_DIR)/$(CRAMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/target/device/AMD/DBAu1500/linux26.mk b/target/device/AMD/DBAu1500/linux26.mk index 5ddea33339..24ad591a07 100644 --- a/target/device/AMD/DBAu1500/linux26.mk +++ b/target/device/AMD/DBAu1500/linux26.mk @@ -41,7 +41,7 @@ LINUX26_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) ARCH=$(KERNEL_ARCH) \ $(DL_DIR)/$(LINUX26_SOURCE): - $(WGET) -P $(DL_DIR) $(LINUX26_SITE)/$(LINUX26_SOURCE) + $(call DOWNLOAD,$(LINUX26_SITE),$(LINUX26_SOURCE)) $(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE) rm -rf $(LINUX26_DIR) diff --git a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk index 0a2ffcbbc8..c59e2bcfa5 100644 --- a/target/device/Atmel/DataFlashBoot/DataflashBoot.mk +++ b/target/device/Atmel/DataFlashBoot/DataflashBoot.mk @@ -13,7 +13,7 @@ DATAFLASHBOOT_DIR:=$(PROJECT_BUILD_DIR)/$(DATAFLASHBOOT_NAME) DATAFLASHBOOT_BINARY:=$(DATAFLASHBOOT_NAME).bin $(DL_DIR)/$(DATAFLASHBOOT_SOURCE): - $(WGET) -P $(DL_DIR) $(DATAFLASHBOOT_SITE)/$(DATAFLASHBOOT_SOURCE) + $(call DOWNLOAD,$(DATAFLASHBOOT_SITE),$(DATAFLASHBOOT_SOURCE)) $(DATAFLASHBOOT_DIR)/.unpacked: $(DL_DIR)/$(DATAFLASHBOOT_SOURCE) mkdir -p $(PROJECT_BUILD_DIR) diff --git a/target/device/Atmel/at91bootstrap/at91bootstrap.mk b/target/device/Atmel/at91bootstrap/at91bootstrap.mk index cfe0a1fbcb..059d6a134d 100644 --- a/target/device/Atmel/at91bootstrap/at91bootstrap.mk +++ b/target/device/Atmel/at91bootstrap/at91bootstrap.mk @@ -42,7 +42,7 @@ AT91_CUSTOM_FLAGS+=-DIMG_SIZE=$(AT91BOOTSTRAP_IMG_SIZE) endif $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE): - $(WGET) -P $(DL_DIR) $(AT91BOOTSTRAP_SITE)/$(AT91BOOTSTRAP_SOURCE) + $(call DOWNLOAD,$(AT91BOOTSTRAP_SITE),$(AT91BOOTSTRAP_SOURCE)) $(AT91BOOTSTRAP_DIR)/.unpacked: $(DL_DIR)/$(AT91BOOTSTRAP_SOURCE) mkdir -p $(PROJECT_BUILD_DIR) diff --git a/target/device/Atmel/u-boot/u-boot.mk b/target/device/Atmel/u-boot/u-boot.mk index cf7b974f1f..e15332caef 100644 --- a/target/device/Atmel/u-boot/u-boot.mk +++ b/target/device/Atmel/u-boot/u-boot.mk @@ -43,10 +43,10 @@ TARGET_UBOOT_ETHADDR:=$(strip $(subst ",, $(BR2_TARGET_UBOOT_ETHADDR_AT91))) UBOOT_CUSTOM:=$(UBOOT_DIR)/include/custom.h $(DL_DIR)/$(UBOOT_SOURCE): - $(WGET) -P $(DL_DIR) $(UBOOT_SITE)/$(UBOOT_SOURCE) + $(call DOWNLOAD,$(UBOOT_SITE),$(UBOOT_SOURCE)) $(DL_DIR)/$(UBOOT_PATCH_SOURCE): - $(WGET) -P $(DL_DIR) $(UBOOT_PATCH_SITE)/$(UBOOT_PATCH_SOURCE) + $(call DOWNLOAD,$(UBOOT_PATCH_SITE),$(UBOOT_PATCH_SOURCE)) $(UBOOT_DIR)/.unpacked: $(DL_DIR)/$(UBOOT_SOURCE) mkdir -p $(BUILD_DIR) diff --git a/target/device/Sharp/LNode80/linux.mk b/target/device/Sharp/LNode80/linux.mk index 28a786fc0c..e5fd47d9a8 100644 --- a/target/device/Sharp/LNode80/linux.mk +++ b/target/device/Sharp/LNode80/linux.mk @@ -57,7 +57,7 @@ LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) + $(call DOWNLOAD,$(LINUX_SITE),$(LINUX_SOURCE)) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/target/device/Soekris/net4521/linux.mk b/target/device/Soekris/net4521/linux.mk index c62e1de54d..c85211efe8 100644 --- a/target/device/Soekris/net4521/linux.mk +++ b/target/device/Soekris/net4521/linux.mk @@ -58,7 +58,7 @@ LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) + $(call DOWNLOAD,$(LINUX_SITE),$(LINUX_SOURCE)) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/target/device/Soekris/soekris_gpio/soekris_gpio.mk b/target/device/Soekris/soekris_gpio/soekris_gpio.mk index 6b692ee5c6..9690a4978c 100644 --- a/target/device/Soekris/soekris_gpio/soekris_gpio.mk +++ b/target/device/Soekris/soekris_gpio/soekris_gpio.mk @@ -30,7 +30,7 @@ SOEKRIS_GPIO_CAT:=$(ZCAT) SOEKRIS_GPIO_MODULE_DIR=lib/modules/$(LINUX_VERSION)/kernel/drivers/soekris/ $(DL_DIR)/$(SOEKRIS_GPIO_SOURCE): - $(WGET) -P $(DL_DIR) $(SOEKRIS_GPIO_SITE)/$(SOEKRIS_GPIO_SOURCE) + $(call DOWNLOAD,$(SOEKRIS_GPIO_SITE),$(SOEKRIS_GPIO_SOURCE)) soekris_gpio-source: $(DL_DIR)/$(SOEKRIS_GPIO_SOURCE) diff --git a/target/device/Via/epia-mii/linux.mk b/target/device/Via/epia-mii/linux.mk index 2d5f7e899f..5118348303 100644 --- a/target/device/Via/epia-mii/linux.mk +++ b/target/device/Via/epia-mii/linux.mk @@ -46,7 +46,7 @@ LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) + $(call DOWNLOAD,$(LINUX_SITE),$(LINUX_SOURCE)) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/target/device/jp/q5/linux.mk b/target/device/jp/q5/linux.mk index a086028cab..b246143f0f 100644 --- a/target/device/jp/q5/linux.mk +++ b/target/device/jp/q5/linux.mk @@ -56,7 +56,7 @@ LINUX_SOURCE_DIR=$(LINUX_DIR) $(DL_DIR)/$(LINUX_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(LINUX_SITE)/$(LINUX_SOURCE) + $(call DOWNLOAD,$(LINUX_SITE),$(LINUX_SOURCE)) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk index fc8c4a84e2..9d5f837a1b 100644 --- a/target/ext2/ext2root.mk +++ b/target/ext2/ext2root.mk @@ -9,7 +9,7 @@ GENEXT2_SOURCE=genext2fs-$(GENEXT2_VERSION).tar.gz GENEXT2_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs $(DL_DIR)/$(GENEXT2_SOURCE): - $(WGET) -P $(DL_DIR) $(GENEXT2_SITE)/$(GENEXT2_SOURCE) + $(call DOWNLOAD,$(GENEXT2_SITE),$(GENEXT2_SOURCE)) $(GENEXT2_DIR)/.unpacked: $(DL_DIR)/$(GENEXT2_SOURCE) $(ZCAT) $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk index 778df0365c..02fdccf249 100644 --- a/target/iso9660/iso9660.mk +++ b/target/iso9660/iso9660.mk @@ -10,7 +10,7 @@ MKISOFS_DIR:=$(BUILD_DIR)/cdrtools-2.01 MKISOFS_TARGET:=$(MKISOFS_DIR)/mkisofs/OBJ/i686-linux-cc/mkisofs $(DL_DIR)/$(MKISOFS_SOURCE): - $(WGET) -P $(DL_DIR) $(MKISOFS_SITE)/$(MKISOFS_SOURCE) + $(call DOWNLOAD,$(MKISOFS_SITE),$(MKISOFS_SOURCE)) mkisofs-source: $(DL_DIR)/$(MKISOFS_SOURCE) diff --git a/target/powerpc/yaboot/yaboot.mk b/target/powerpc/yaboot/yaboot.mk index a89155cdc1..cbeae50861 100644 --- a/target/powerpc/yaboot/yaboot.mk +++ b/target/powerpc/yaboot/yaboot.mk @@ -11,7 +11,7 @@ YABOOT_SITE:=http://penguinppc.org/bootloaders/yaboot YABOOT_DIR:=$(BUILD_DIR)/yaboot-1.3.13 $(DL_DIR)/$(YABOOT_SOURCE): - $(WGET) -P $(DL_DIR) $(YABOOT_SITE)/$(YABOOT_SOURCE) + $(call DOWNLOAD,$(YABOOT_SITE),$(YABOOT_SOURCE)) yaboot-source: $(DL_DIR)/$(YABOOT_SOURCE) diff --git a/target/romfs/romfs.mk b/target/romfs/romfs.mk index fba6792a08..52caca7522 100644 --- a/target/romfs/romfs.mk +++ b/target/romfs/romfs.mk @@ -9,7 +9,7 @@ ROMFS_SOURCE=genromfs-$(ROMFS_VERSION).tar.gz ROMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/romfs $(DL_DIR)/$(ROMFS_SOURCE): - $(WGET) -P $(DL_DIR) $(ROMFS_SITE)/$(ROMFS_SOURCE) + $(call DOWNLOAD,$(ROMFS_SITE),$(ROMFS_SOURCE)) $(ROMFS_DIR): $(DL_DIR)/$(ROMFS_SOURCE) $(ZCAT) $(DL_DIR)/$(ROMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk index 51ba7665c0..6ccd503fb4 100644 --- a/target/squashfs/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk @@ -10,7 +10,7 @@ SQUASHFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/s SQUASHFS_CAT:=$(ZCAT) $(DL_DIR)/$(SQUASHFS_SOURCE): - $(WGET) -P $(DL_DIR) $(SQUASHFS_SITE)/$(SQUASHFS_SOURCE) + $(call DOWNLOAD,$(SQUASHFS_SITE),$(SQUASHFS_SOURCE)) $(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH) $(SQUASHFS_CAT) $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/target/ubifs/ubifsroot.mk b/target/ubifs/ubifsroot.mk index d397ff2f50..f0b519d814 100644 --- a/target/ubifs/ubifsroot.mk +++ b/target/ubifs/ubifsroot.mk @@ -13,7 +13,7 @@ MKFS_UBIFS_CAT:=$(ZCAT) MKFS_UBIFS_NAME:=mkfs.ubifs $(DL_DIR)/$(MKFS_UBIFS_SOURCE): - $(WGET) -O $(DL_DIR)/$(MKFS_UBIFS_SOURCE) "$(MKFS_UBIFS_URL)" + $(call DOWNLOAD,"$(MKFS_UBIFS_URL)") $(MKFS_UBIFS_DIR)/.unpacked: $(DL_DIR)/$(MKFS_UBIFS_SOURCE) $(ZCAT) $(DL_DIR)/$(MKFS_UBIFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/target/x86/grub/grub.mk b/target/x86/grub/grub.mk index b7484cb431..dd6aa7a323 100644 --- a/target/x86/grub/grub.mk +++ b/target/x86/grub/grub.mk @@ -62,10 +62,10 @@ GRUB_CONFIG-$(BR2_TARGET_GRUB_via_rhine) += --enable-via-rhine GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840 $(DL_DIR)/$(GRUB_SOURCE): - $(WGET) -P $(DL_DIR) $(GRUB_SITE)/$(GRUB_SOURCE) + $(call DOWNLOAD,$(GRUB_SITE),$(GRUB_SOURCE)) $(DL_DIR)/$(GRUB_PATCH): - $(WGET) -P $(DL_DIR) $(GRUB_PATCH_SITE)/$(GRUB_PATCH) + $(call DOWNLOAD,$(GRUB_PATCH_SITE),$(GRUB_PATCH)) grub-source: $(DL_DIR)/$(GRUB_SOURCE) $(DL_DIR)/$(GRUB_PATCH) diff --git a/target/x86/grub2/grub2.mk b/target/x86/grub2/grub2.mk index 95db8ec421..cbf6df8909 100644 --- a/target/x86/grub2/grub2.mk +++ b/target/x86/grub2/grub2.mk @@ -62,10 +62,10 @@ GRUB2_CONFIG-$(BR2_TARGET_GRUB2_via_rhine) += --enable-via-rhine GRUB2_CONFIG-$(BR2_TARGET_GRUB2_w89c840) += --enable-w89c840 $(DL_DIR)/$(GRUB2_SOURCE): - $(WGET) -P $(DL_DIR) $(GRUB2_SITE)/$(GRUB2_SOURCE) + $(call DOWNLOAD,$(GRUB2_SITE),$(GRUB2_SOURCE)) $(DL_DIR)/$(GRUB2_PATCH): - $(WGET) -P $(DL_DIR) $(GRUB2_PATCH_SITE)/$(GRUB2_PATCH) + $(call DOWNLOAD,$(GRUB2_PATCH_SITE),$(GRUB2_PATCH)) grub2-source: $(DL_DIR)/$(GRUB2_SOURCE) $(DL_DIR)/$(GRUB2_PATCH) diff --git a/target/x86/syslinux/syslinux.mk b/target/x86/syslinux/syslinux.mk index b7603caee4..27930c7c0b 100644 --- a/target/x86/syslinux/syslinux.mk +++ b/target/x86/syslinux/syslinux.mk @@ -32,7 +32,7 @@ SYSLINUX_BIN=$(SYSLINUX_DIR2)/mtools/syslinux $(DL_DIR)/$(SYSLINUX_SOURCE): - $(WGET) -P $(DL_DIR) $(SYSLINUX_SITE)/$(SYSLINUX_SOURCE) + $(call DOWNLOAD,$(SYSLINUX_SITE),$(SYSLINUX_SOURCE)) syslinux-source: $(DL_DIR)/$(SYSLINUX_SOURCE) -- 2.30.2