From 07b2af1a45c5276125b54d64f839fdcd660d602d Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 2 Sep 2010 12:09:44 +0200 Subject: [PATCH 1/8] Remove the spider feature In preparation for the re-work of the DOWNLOAD helper to support multiple download methods and protocols, the spider feature used with wget is removed for now until it is re-implemented on top of the new download methods. Signed-off-by: Maxime Petazzoni Signed-off-by: Thomas Petazzoni --- Makefile | 7 +++---- package/Makefile.package.in | 10 ---------- package/mpfr/mpfr.mk | 2 -- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 1ab446d8ba..59a0e23034 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,7 @@ ifeq ($(ARCH),xtensa) ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name)) endif -WGET:=$(call qstrip,$(BR2_WGET)) $(SPIDER) $(QUIET) +WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET) SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET) SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET) BZR_CO:=$(call qstrip,$(BR2_BZR_CO)) $(QUIET) @@ -437,11 +437,10 @@ endif source: $(TARGETS_SOURCE) $(HOST_SOURCE) _source-check: - $(MAKE) $(EXTRAMAKEARGS) SPIDER=--spider source + @echo "TODO $@" external-deps: - @$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \ - $(EXTRAMAKEARGS) SPIDER=--spider source + @echo "TODO $@" show-targets: @echo $(TARGETS) diff --git a/package/Makefile.package.in b/package/Makefile.package.in index d76b7913d2..ba0fd8433f 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -81,16 +81,11 @@ TERM_RESET := $(shell tput rmso) # $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE)) ################################################################################ -# support make source-check/external-deps -ifneq ($(SPIDER),) -DOWNLOAD=$(WGET) -P $(DL_DIR) $(1)/$(2) -else define DOWNLOAD $(Q)test -e $(DL_DIR)/$(2) || \ for site in $(call qstrip,$(BR2_PRIMARY_SITE)) $(1) $(call qstrip,$(BR2_BACKUP_SITE)); \ do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done endef -endif # Utility programs used to build packages TAR ?= tar @@ -117,19 +112,14 @@ endef # Retrieve the archive $(BUILD_DIR)/%/.stamp_downloaded: -# support make source-check/external-deps -ifeq ($(SPIDER),) # Only show the download message if it isn't already downloaded $(Q)(test -e $(DL_DIR)/$($(PKG)_SOURCE) && \ (test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \ $(call MESSAGE,"Downloading") -endif $(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE)) $(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH))) -ifeq ($(SPIDER),) $(Q)mkdir -p $(@D) $(Q)touch $@ -endif # Unpack the archive $(BUILD_DIR)/%/.stamp_extracted: diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index a7834dd9bc..b7b80a5a4a 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -21,10 +21,8 @@ MPFR_PATCH_SOURCE:=$(DL_DIR)/$(MPFR_PATCH_FILE) $(MPFR_PATCH_SOURCE): $(call DOWNLOAD,$(MPFR_SITE),$(MPFR_PATCH)) -ifeq ($(SPIDER),) # this breaks source-check/external-deps mv $(DL_DIR)/$(MPFR_PATCH) $@ endif -endif $(DL_DIR)/$(MPFR_SOURCE): $(call DOWNLOAD,$(MPFR_SITE),$(MPFR_SOURCE)) From cf71111b99ab95118c6bd4770797f31961a9aa14 Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 2 Sep 2010 12:09:45 +0200 Subject: [PATCH 2/8] Cleanup the VCS commands configuration It's not really necessary to differenciate the commands for checking out or updating a repository. Only the path to the binary and eventual top-level flags are useful to configure. Signed-off-by: Maxime Petazzoni Signed-off-by: Thomas Petazzoni --- Config.in | 24 ++++++++---------------- Makefile | 6 ++---- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/Config.in b/Config.in index da3619a2a7..0f8ddf4fab 100644 --- a/Config.in +++ b/Config.in @@ -21,25 +21,17 @@ config BR2_WGET string "Wget command" default "wget --passive-ftp -nd" -config BR2_SVN_CO - string "Subversion (svn) command to download source tree" - default "svn co" +config BR2_SVN + string "Subversion (svn) command" + default "svn" -config BR2_SVN_UP - string "Subversion (svn) command to update source tree" - default "svn up" - -config BR2_BZR_CO - string "Bazaar (bzr) command to download source tree" - default "bzr co" - -config BR2_BZR_UP - string "Bazaar (bzr) command to update source tree" - default "bzr up" +config BR2_BZR + string "Bazaar (bzr) command" + default "bzr" config BR2_GIT - string "Git command to download source tree" - default "git clone" + string "Git command" + default "git" config BR2_ZCAT string "zcat command" diff --git a/Makefile b/Makefile index 59a0e23034..7780403087 100644 --- a/Makefile +++ b/Makefile @@ -245,10 +245,8 @@ ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name)) endif WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET) -SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET) -SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET) -BZR_CO:=$(call qstrip,$(BR2_BZR_CO)) $(QUIET) -BZR_UP:=$(call qstrip,$(BR2_BZR_UP)) $(QUIET) +SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET) +BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET) GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET) ZCAT:=$(call qstrip,$(BR2_ZCAT)) BZCAT:=$(call qstrip,$(BR2_BZCAT)) From 9eddd31df3ae821e8ff39e31e2ee1b39ca3891c3 Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 2 Sep 2010 12:09:46 +0200 Subject: [PATCH 3/8] Update defconfigs with new VCS config options Signed-off-by: Maxime Petazzoni Signed-off-by: Thomas Petazzoni --- configs/arm_toolchain_defconfig | 5 ++--- configs/at91rm9200df_defconfig | 5 ++--- configs/at91rm9200df_ext_bare_defconfig | 5 ++--- configs/at91rm9200df_ext_defconfig | 5 ++--- configs/at91sam9260dfc_defconfig | 5 ++--- configs/at91sam9260dfc_ext_bare_defconfig | 5 ++--- configs/at91sam9260dfc_ext_defconfig | 5 ++--- configs/at91sam9261ek_defconfig | 5 ++--- configs/at91sam9261ek_ext_bare_defconfig | 5 ++--- configs/at91sam9261ek_ext_defconfig | 5 ++--- configs/at91sam9263ek_defconfig | 5 ++--- configs/at91sam9263ek_ext_bare_defconfig | 5 ++--- configs/at91sam9263ek_ext_defconfig | 5 ++--- configs/at91sam9g20dfc_defconfig | 5 ++--- configs/at91sam9g20dfc_ext_bare_defconfig | 5 ++--- configs/at91sam9g20dfc_ext_defconfig | 5 ++--- configs/atngw100-base_defconfig | 5 ++--- configs/atngw100_defconfig | 5 ++--- configs/atstk1005_defconfig | 5 ++--- configs/atstk100x_defconfig | 5 ++--- configs/i386_defconfig | 5 ++--- configs/i686_defconfig | 5 ++--- configs/integrator926_defconfig | 5 ++--- configs/integrator926_huge_defconfig | 5 ++--- configs/kb9202_defconfig | 5 ++--- configs/v100sc2_defconfig | 5 ++--- 26 files changed, 52 insertions(+), 78 deletions(-) diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig index bd6f3e2812..632906b72f 100644 --- a/configs/arm_toolchain_defconfig +++ b/configs/arm_toolchain_defconfig @@ -131,9 +131,8 @@ BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6" # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig index 727a6ea3dc..b7e12602e1 100644 --- a/configs/at91rm9200df_defconfig +++ b/configs/at91rm9200df_defconfig @@ -136,9 +136,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig index fec2c04aba..20eb6a7f79 100644 --- a/configs/at91rm9200df_ext_bare_defconfig +++ b/configs/at91rm9200df_ext_bare_defconfig @@ -131,9 +131,8 @@ BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6" # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig index c73e372730..7383a530f0 100644 --- a/configs/at91rm9200df_ext_defconfig +++ b/configs/at91rm9200df_ext_defconfig @@ -142,9 +142,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig index de002c4be6..715f07051d 100644 --- a/configs/at91sam9260dfc_defconfig +++ b/configs/at91sam9260dfc_defconfig @@ -149,9 +149,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig index 540eef6668..f3c17ed2bb 100644 --- a/configs/at91sam9260dfc_ext_bare_defconfig +++ b/configs/at91sam9260dfc_ext_bare_defconfig @@ -131,9 +131,8 @@ BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6" # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig index 91cdeddab5..6dc741a256 100644 --- a/configs/at91sam9260dfc_ext_defconfig +++ b/configs/at91sam9260dfc_ext_defconfig @@ -150,9 +150,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig index 0a1fc51129..64b50c8c45 100644 --- a/configs/at91sam9261ek_defconfig +++ b/configs/at91sam9261ek_defconfig @@ -152,9 +152,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig index ab8851f9cf..b83e0a76fb 100644 --- a/configs/at91sam9261ek_ext_bare_defconfig +++ b/configs/at91sam9261ek_ext_bare_defconfig @@ -134,9 +134,8 @@ BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6" # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig index 6ebe9fd8f2..de01e4941c 100644 --- a/configs/at91sam9261ek_ext_defconfig +++ b/configs/at91sam9261ek_ext_defconfig @@ -153,9 +153,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig index d293108189..41795d03dc 100644 --- a/configs/at91sam9263ek_defconfig +++ b/configs/at91sam9263ek_defconfig @@ -150,9 +150,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig index 2578b95099..40f0fe589f 100644 --- a/configs/at91sam9263ek_ext_bare_defconfig +++ b/configs/at91sam9263ek_ext_bare_defconfig @@ -133,9 +133,8 @@ BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6" # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig index 843b0fb0df..f537e9fb68 100644 --- a/configs/at91sam9263ek_ext_defconfig +++ b/configs/at91sam9263ek_ext_defconfig @@ -152,9 +152,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index a9347a8a6d..0bae9ba85f 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -150,9 +150,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig index 49a5124cb5..ab0b725723 100644 --- a/configs/at91sam9g20dfc_ext_bare_defconfig +++ b/configs/at91sam9g20dfc_ext_bare_defconfig @@ -131,9 +131,8 @@ BR2_AT91_LINUXPATCH_SITE="http://maxim.org.za/AT91RM9200/2.6" # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig index bd967235f7..aeb89738a8 100644 --- a/configs/at91sam9g20dfc_ext_defconfig +++ b/configs/at91sam9g20dfc_ext_defconfig @@ -150,9 +150,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-arm/kernel-patches-$(BR2_KER # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig index 116f671f90..0c85ea8cab 100644 --- a/configs/atngw100-base_defconfig +++ b/configs/atngw100-base_defconfig @@ -84,9 +84,8 @@ BR2_TARGET_AVR32_ATNGW100_BASE=y # Build options # BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="zcat" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index 50c376b314..d1c43bab38 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -69,11 +69,10 @@ BR2_TARGET_AVR32_ATNGW100=y # Commands # BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" +BR2_SVN="svn" BR2_BZR_CO="bzr co" BR2_BZR_UP="bzr up" -BR2_GIT="git clone" +BR2_GIT="git" BR2_ZCAT="zcat" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig index d95b666388..16af8baa29 100644 --- a/configs/atstk1005_defconfig +++ b/configs/atstk1005_defconfig @@ -82,9 +82,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-avr32/kernel-patches-$(BR2_K # Build options # BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="zcat" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig index 3069f6a35a..8bb771d48b 100644 --- a/configs/atstk100x_defconfig +++ b/configs/atstk100x_defconfig @@ -83,9 +83,8 @@ BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-avr32/kernel-patches-$(BR2_K # Build options # BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="zcat" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/i386_defconfig b/configs/i386_defconfig index e30ec3f551..fb03076736 100644 --- a/configs/i386_defconfig +++ b/configs/i386_defconfig @@ -85,9 +85,8 @@ BR2_TARGET_I686=y # Build options # BR2_WGET="wget --passive-ftp" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/i686_defconfig b/configs/i686_defconfig index 916454db07..1a657dbe14 100644 --- a/configs/i686_defconfig +++ b/configs/i686_defconfig @@ -85,9 +85,8 @@ BR2_TARGET_I686=y # Build options # BR2_WGET="wget --passive-ftp" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig index 3d82ba234b..0b4c2193e8 100644 --- a/configs/integrator926_defconfig +++ b/configs/integrator926_defconfig @@ -81,9 +81,8 @@ BR2_BOARD_PATH="target/device/ARMLTD/$(BR2_BOARD_NAME)" # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig index ca133399b2..2d5c352a17 100644 --- a/configs/integrator926_huge_defconfig +++ b/configs/integrator926_huge_defconfig @@ -81,9 +81,8 @@ BR2_BOARD_PATH="target/device/ARMLTD/$(BR2_BOARD_NAME)" # Build options # BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig index 4f392abcdd..1e1fcc8561 100644 --- a/configs/kb9202_defconfig +++ b/configs/kb9202_defconfig @@ -92,9 +92,8 @@ BR2_TARGET_ARM=y # BR2_PRIMARY_SITE="" BR2_WGET="wget --passive-ftp -nd" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="gzip -d -c" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig index c82e7d7c72..8e9f96e5e8 100644 --- a/configs/v100sc2_defconfig +++ b/configs/v100sc2_defconfig @@ -63,9 +63,8 @@ BR2_TARGET_VALKA_V100SC2=y # BR2_PRIMARY_SITE="" BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10" -BR2_SVN_CO="svn co" -BR2_SVN_UP="svn up" -BR2_GIT="git clone" +BR2_SVN="svn" +BR2_GIT="git" BR2_ZCAT="zcat" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" From 993e51bc22f508fbaf39c5c49fd0595fc5c56013 Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 2 Sep 2010 12:09:47 +0200 Subject: [PATCH 4/8] Implement basic non-wget download methods Packages can now be sourced from Git and Subversion repositories. The download method will be autodetected from the URI (git://, svn://, etc). If the repository is accessed through http(s), you can force the download method by setting a _SITE_METHOD variable to either 'git' or 'svn', respectively and without the quotes. The package's _VERSION variable defines which commit, revision, tag or branch should be checked out. For Git, it can be HEAD, a commit ID, a tag name or branch name (anything that can be checked out with `git checkout`). For Subversion, it must be a revision number, or HEAD. Signed-off-by: Maxime Petazzoni Signed-off-by: Thomas Petazzoni --- package/Makefile.package.in | 68 ++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/package/Makefile.package.in b/package/Makefile.package.in index ba0fd8433f..5444472ad3 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -68,6 +68,35 @@ MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESE TERM_BOLD := $(shell tput smso) TERM_RESET := $(shell tput rmso) +################################################################################ +# The DOWNLOAD_{GIT,SVN} helpers are in charge of getting a working copy of +# the source repository for their corresponding SCM, checking out the requested +# version / commit / tag, and create an archive out of it. +################################################################################ + +define DOWNLOAD_GIT + pushd $(DL_DIR) > /dev/null && \ + $(GIT) clone $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \ + pushd $($(PKG)_BASE_NAME) > /dev/null && \ + $(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \ + gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \ + popd > /dev/null && \ + rm -rf $($(PKG)_DL_DIR) && \ + popd > /dev/null +endef + +define DOWNLOAD_SVN + pushd $(DL_DIR) > /dev/null && \ + $(SVN) export -r $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_DL_DIR) && \ + $(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \ + rm -rf $($(PKG)_DL_DIR) && \ + popd > /dev/null +endef + +define DOWNLOAD_WGET + $(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2) +endef + ################################################################################ # DOWNLOAD -- Download helper. Will try to download source from: # 1) BR2_PRIMARY_SITE if enabled @@ -83,8 +112,20 @@ TERM_RESET := $(shell tput rmso) define DOWNLOAD $(Q)test -e $(DL_DIR)/$(2) || \ - for site in $(call qstrip,$(BR2_PRIMARY_SITE)) $(1) $(call qstrip,$(BR2_BACKUP_SITE)); \ - do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done + (if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \ + $(call DOWNLOAD_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ; \ + fi ; \ + if test -n "$(1)" ; then \ + case "$($(PKG)_SITE_METHOD)" in \ + git) $(DOWNLOAD_GIT) && exit ;; \ + svn) $(DOWNLOAD_SVN) && exit ;; \ + *) $(call DOWNLOAD_WGET,$(1),$(2)) && exit ;; \ + esac ; \ + fi ; \ + if test -n "$(call qstrip,$(BR2_BACKUP_SITE))" ; then \ + $(call DOWNLOAD_WGET,$(BR2_BACKUP_SITE),$(2)) && exit ; \ + fi ; \ + exit 1) endef # Utility programs used to build packages @@ -244,13 +285,23 @@ ifndef $(2)_VERSION endif endif -$(2)_DIR = $$(BUILD_DIR)/$(1)-$$($(2)_VERSION) +# Keep the package version that may contain forward slashes in the _DL_VERSION +# variable, then replace all forward slashes ('/') by underscores ('_') to +# sanitize the package version that is used in paths, directory and file names. +# Forward slashes may appear in the package's version when pointing to a +# version control system branch or tag, for example remotes/origin/1_10_stable. +$(2)_DL_VERSION = $($(2)_VERSION) +$(2)_VERSION = $(subst /,_,$($(2)_VERSION)) + +$(2)_BASE_NAME = $(1)-$$($(2)_VERSION) +$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) +$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) ifndef $(2)_SOURCE ifdef $(3)_SOURCE $(2)_SOURCE = $($(3)_SOURCE) else - $(2)_SOURCE ?= $(1)-$$($(2)_VERSION).tar.gz + $(2)_SOURCE ?= $$($(2)_BASE_NAME).tar.gz endif endif @@ -269,6 +320,15 @@ ifndef $(2)_SITE endif endif +ifndef $(2)_SITE_METHOD + ifdef $(3)_SITE_METHOD + $(2)_SITE_METHOD = $($(3)_SITE_METHOD) + else + # Try automatic detection using the scheme part of the URI + $(2)_SITE_METHOD = $(firstword $(subst ://, ,$(call qstrip,$($(2)_SITE)))) + endif +endif + $(2)_DEPENDENCIES ?= $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_TARGET ?= YES From 91f2599d9b9f069f719f5577ae44d987ccd58649 Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 2 Sep 2010 12:09:48 +0200 Subject: [PATCH 5/8] Use the normal download method for Tremor Now that the generic download method supports Subversion, fall back to the normal usage of AUTOTARGETS for Tremor. Signed-off-by: Maxime Petazzoni Signed-off-by: Thomas Petazzoni --- package/multimedia/tremor/tremor.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/package/multimedia/tremor/tremor.mk b/package/multimedia/tremor/tremor.mk index 74fd725ff0..654a403ee0 100644 --- a/package/multimedia/tremor/tremor.mk +++ b/package/multimedia/tremor/tremor.mk @@ -5,19 +5,11 @@ ############################################################ TREMOR_SITE:=http://svn.xiph.org/trunk/Tremor/ +TREMOR_SITE_METHOD:=svn TREMOR_VERSION:=16259 -TREMOR_SVNDIR = Tremor-svn-r$(TREMOR_VERSION) -TREMOR_SOURCE:= $(TREMOR_SVNDIR).tar.bz2 + TREMOR_AUTORECONF = YES TREMOR_INSTALL_STAGING = YES TREMOR_INSTALL_TARGET = YES -$(DL_DIR)/$(TREMOR_SOURCE): - $(SVN_CO) -r $(TREMOR_VERSION) $(TREMOR_SITE) $(BUILD_DIR)/$(TREMOR_SVNDIR) - tar -cv -C $(BUILD_DIR) $(TREMOR_SVNDIR) | bzip2 - -c > $@ - rm -rf $(BUILD_DIR)/$(TREMOR_SVNDIR) - -# use custom download step -TREMOR_TARGET_SOURCE := $(DL_DIR)/$(TREMOR_SOURCE) - $(eval $(call AUTOTARGETS,package/multimedia,tremor)) From 9b2ac9f9acd915d8086f4e74c2be672aa83f0d70 Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 2 Sep 2010 12:09:49 +0200 Subject: [PATCH 6/8] Use the normal download method for libsvgtiny Now that the generic download method supports Subversion, fall back to the normal usage of AUTOTARGETS for libsvgtiny. Signed-off-by: Maxime Petazzoni Signed-off-by: Thomas Petazzoni --- package/libsvgtiny/libsvgtiny.mk | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk index b559e52ad6..d9ac41b44e 100644 --- a/package/libsvgtiny/libsvgtiny.mk +++ b/package/libsvgtiny/libsvgtiny.mk @@ -6,20 +6,11 @@ LIBSVGTINY_SITE = svn://svn.netsurf-browser.org/trunk/libsvgtiny LIBSVGTINY_VERSION = 9800 -LIBSVGTINY_SVNDIR = libsvgtiny-svn-r$(LIBSVGTINY_VERSION) -LIBSVGTINY_SOURCE = $(LIBSVGTINY_SVNDIR).tar.bz2 + LIBSVGTINY_INSTALL_STAGING = YES LIBSVGTINY_INSTALL_TARGET = YES LIBSVGTINY_DEPENDENCIES = libxml2 host-gperf host-pkg-config -$(DL_DIR)/$(LIBSVGTINY_SOURCE): - $(SVN_CO) -r $(LIBSVGTINY_VERSION) $(LIBSVGTINY_SITE) $(BUILD_DIR)/$(LIBSVGTINY_SVNDIR) - tar -cv -C $(BUILD_DIR) $(LIBSVGTINY_SVNDIR) | bzip2 - -c > $@ - rm -rf $(BUILD_DIR)/$(LIBSVGTINY_SVNDIR) - -# use custom download step -LIBSVGTINY_TARGET_SOURCE := $(DL_DIR)/$(LIBSVGTINY_SOURCE) - define LIBSVGTINY_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=/usr endef From d147b81fda4419ea7307835d39cdb58b965882aa Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 2 Sep 2010 12:31:57 +0200 Subject: [PATCH 7/8] Re-implement the source-check and external-deps targets The new DL_MODE variable dispatches between the various download implementations of each method (Git, Subversion, Wget) to deal with the normal download (default mode, 'DOWNLOAD'), the source-check ('SOURCE_CHECK') and to show the external dependencies for external-deps ('SHOW_EXTERNAL_DEPS'). For the latter, the legacy script wget-show-external-deps.sh is no longer required as $(WGET) isn't called directly anymore but always through the DOWNLOAD helper. Signed-off-by: Maxime Petazzoni Signed-off-by: Thomas Petazzoni --- Makefile | 13 +---- package/Makefile.package.in | 86 +++++++++++++++++++++++----- package/mpfr/mpfr.mk | 2 + toolchain/wget-show-external-deps.sh | 6 -- 4 files changed, 77 insertions(+), 30 deletions(-) delete mode 100755 toolchain/wget-show-external-deps.sh diff --git a/Makefile b/Makefile index 7780403087..faa802bb75 100644 --- a/Makefile +++ b/Makefile @@ -244,19 +244,10 @@ ifeq ($(ARCH),xtensa) ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name)) endif -WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET) -SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET) -BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET) -GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET) ZCAT:=$(call qstrip,$(BR2_ZCAT)) BZCAT:=$(call qstrip,$(BR2_BZCAT)) TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf -DL_DIR=$(call qstrip,$(BR2_DL_DIR)) -ifeq ($(DL_DIR),) -DL_DIR:=$(TOPDIR)/dl -endif - GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX)) STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR)) @@ -435,10 +426,10 @@ endif source: $(TARGETS_SOURCE) $(HOST_SOURCE) _source-check: - @echo "TODO $@" + $(MAKE) DL_MODE=SOURCE_CHECK $(EXTRAMAKEARGS) source external-deps: - @echo "TODO $@" + @$(MAKE) -Bs DL_MODE=SHOW_EXTERNAL_DEPS $(EXTRAMAKEARGS) source show-targets: @echo $(TARGETS) diff --git a/package/Makefile.package.in b/package/Makefile.package.in index 5444472ad3..6f584a747a 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -68,35 +68,92 @@ MESSAGE = echo "$(TERM_BOLD)>>> $($(PKG)_NAME) $($(PKG)_VERSION) $(1)$(TERM_RESE TERM_BOLD := $(shell tput smso) TERM_RESET := $(shell tput rmso) +# Download method commands +WGET:=$(call qstrip,$(BR2_WGET)) $(QUIET) +SVN:=$(call qstrip,$(BR2_SVN)) $(QUIET) +BZR:=$(call qstrip,$(BR2_BZR)) $(QUIET) +GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET) + +# Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK' +# used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the +# external-deps target. +DL_MODE=DOWNLOAD + +DL_DIR=$(call qstrip,$(BR2_DL_DIR)) +ifeq ($(DL_DIR),) +DL_DIR:=$(TOPDIR)/dl +endif + ################################################################################ # The DOWNLOAD_{GIT,SVN} helpers are in charge of getting a working copy of # the source repository for their corresponding SCM, checking out the requested -# version / commit / tag, and create an archive out of it. +# version / commit / tag, and create an archive out of it. DOWNLOAD_WGET is the +# normal wget-based download mechanism. +# +# The SOURCE_CHECK_{GIT,SVN,WGET} helpers are in charge of simply checking that +# the source is available for download. This can be used to make sure one will +# be able to get all the sources needed for one's build configuration. +# +# The SHOW_EXTERNAL_DEPS_{GIT,SVN,WGET} helpers simply output to the console +# the names of the files that will be downloaded, or path and revision of the +# source repositories, producing a list of all the "external dependencies" of +# a given build configuration. ################################################################################ define DOWNLOAD_GIT - pushd $(DL_DIR) > /dev/null && \ + test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ + (pushd $(DL_DIR) > /dev/null && \ $(GIT) clone $($(PKG)_SITE) $($(PKG)_BASE_NAME) && \ pushd $($(PKG)_BASE_NAME) > /dev/null && \ $(GIT) archive --format=tar --prefix=$($(PKG)_BASE_NAME)/ $($(PKG)_DL_VERSION) | \ gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \ popd > /dev/null && \ rm -rf $($(PKG)_DL_DIR) && \ - popd > /dev/null + popd > /dev/null) endef +# TODO: improve to check that the given PKG_DL_VERSION exists on the remote +# repository +define SOURCE_CHECK_GIT + $(GIT) ls-remote --heads $($(PKG)_SITE) > /dev/null +endef + +define SHOW_EXTERNAL_DEPS_GIT + echo "$($(PKG)_SITE) [git: $($(PKG)_DL_VERSION)]" +endef + + define DOWNLOAD_SVN - pushd $(DL_DIR) > /dev/null && \ + test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ + (pushd $(DL_DIR) > /dev/null && \ $(SVN) export -r $($(PKG)_DL_VERSION) $($(PKG)_SITE) $($(PKG)_DL_DIR) && \ $(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \ rm -rf $($(PKG)_DL_DIR) && \ - popd > /dev/null + popd > /dev/null) endef +define SOURCE_CHECK_SVN + $(SVN) ls $($(PKG)_SITE) > /dev/null +endef + +define SHOW_EXTERNAL_DEPS_SVN + echo "$($(PKG)_SITE) [svn: $($(PKG)_DL_VERSION)]" +endef + + define DOWNLOAD_WGET + test -e $(DL_DIR)/$(2) || \ $(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2) endef +define SOURCE_CHECK_WGET + $(WGET) --spider $(call qstrip,$(1))/$(2) +endef + +define SHOW_EXTERNAL_DEPS_WGET + echo $(2) +endef + ################################################################################ # DOWNLOAD -- Download helper. Will try to download source from: # 1) BR2_PRIMARY_SITE if enabled @@ -111,21 +168,20 @@ endef ################################################################################ define DOWNLOAD - $(Q)test -e $(DL_DIR)/$(2) || \ - (if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \ - $(call DOWNLOAD_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ; \ + $(Q)if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \ + $(call $(DL_MODE)_WGET,$(BR2_PRIMARY_SITE),$(2)) && exit ; \ fi ; \ if test -n "$(1)" ; then \ case "$($(PKG)_SITE_METHOD)" in \ - git) $(DOWNLOAD_GIT) && exit ;; \ - svn) $(DOWNLOAD_SVN) && exit ;; \ - *) $(call DOWNLOAD_WGET,$(1),$(2)) && exit ;; \ + git) $($(DL_MODE)_GIT) && exit ;; \ + svn) $($(DL_MODE)_SVN) && exit ;; \ + *) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \ esac ; \ fi ; \ if test -n "$(call qstrip,$(BR2_BACKUP_SITE))" ; then \ - $(call DOWNLOAD_WGET,$(BR2_BACKUP_SITE),$(2)) && exit ; \ + $(call $(DL_MODE)_WGET,$(BR2_BACKUP_SITE),$(2)) && exit ; \ fi ; \ - exit 1) + exit 1 endef # Utility programs used to build packages @@ -153,14 +209,18 @@ endef # Retrieve the archive $(BUILD_DIR)/%/.stamp_downloaded: +ifeq ($(DL_MODE),DOWNLOAD) # Only show the download message if it isn't already downloaded $(Q)(test -e $(DL_DIR)/$($(PKG)_SOURCE) && \ (test -z $($(PKG)_PATCH) || test -e $(DL_DIR)$($(PKG)_PATCH))) || \ $(call MESSAGE,"Downloading") +endif $(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_SOURCE)) $(if $($(PKG)_PATCH),$(call DOWNLOAD,$($(PKG)_SITE),$($(PKG)_PATCH))) +ifeq ($(DL_MODE),DOWNLOAD) $(Q)mkdir -p $(@D) $(Q)touch $@ +endif # Unpack the archive $(BUILD_DIR)/%/.stamp_extracted: diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index b7b80a5a4a..6979a9f769 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -21,8 +21,10 @@ MPFR_PATCH_SOURCE:=$(DL_DIR)/$(MPFR_PATCH_FILE) $(MPFR_PATCH_SOURCE): $(call DOWNLOAD,$(MPFR_SITE),$(MPFR_PATCH)) +ifeq ($(DL_MODE),DOWNLOAD) mv $(DL_DIR)/$(MPFR_PATCH) $@ endif +endif $(DL_DIR)/$(MPFR_SOURCE): $(call DOWNLOAD,$(MPFR_SITE),$(MPFR_SOURCE)) diff --git a/toolchain/wget-show-external-deps.sh b/toolchain/wget-show-external-deps.sh deleted file mode 100755 index 20071c05fc..0000000000 --- a/toolchain/wget-show-external-deps.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# -# replacement for wget (see BR2_WGET) which simply shows the file name to be -# downloaded. Used by the external-deps make target. - -exec basename ${!#} \ No newline at end of file From 1475384413f2db15bceb69c8c56454319c3ce5e7 Mon Sep 17 00:00:00 2001 From: Maxime Petazzoni Date: Thu, 2 Sep 2010 12:59:26 +0200 Subject: [PATCH 8/8] Revert "Makefile.package.in: allow packages to override download step" This reverts commit 48cf66f1a2e2c501abeee98b7a2268b0d6d2010d. Signed-off-by: Maxime Petazzoni Signed-off-by: Thomas Petazzoni --- package/Makefile.package.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Makefile.package.in b/package/Makefile.package.in index 6f584a747a..58b417b056 100644 --- a/package/Makefile.package.in +++ b/package/Makefile.package.in @@ -402,7 +402,7 @@ $(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built $(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured $(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched $(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted -$(2)_TARGET_SOURCE ?= $$($(2)_DIR)/.stamp_downloaded +$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded $(2)_TARGET_UNINSTALL = $$($(2)_DIR)/.stamp_uninstalled $(2)_TARGET_CLEAN = $$($(2)_DIR)/.stamp_cleaned $(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned