Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [RESEND/PATCH] Git/Svn downloaders
@ 2010-07-20 11:33 Maxime Petazzoni
  2010-07-20 11:33 ` [Buildroot] [PATCH 1/6] Remove the spider feature Maxime Petazzoni
                   ` (6 more replies)
  0 siblings, 7 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-20 11:33 UTC (permalink / raw)
  To: buildroot

Hi,

Integrating the feedback from the first series sent last week, here comes the
promised resend.

What changed from the first batch?

  - the BR2_GIT, BR2_SVN_CO and BR2_SVN_UP configuration options have been
    cleaned up into BR2_GIT="git" and BR2_SVN="svn" and the defconfig files
    updated (I know there has been some discussion about the defconfigs
    recently on the list... this seems to be a hot subject in the community
    right now :-)

  - the download method autodetection from the URI scheme has been added,
    taken from Luca's patch and integrated into mine.

  - tar --exclude-cvs is no longer used, in favor of per-VCS techniques:
      * `git archive --format=tar ... | gzip -c ...` for Git
      * `svn export ... && tar czf ...` for Subversion

  - libsvgtiny now benefits from the download method autodetection


Once we get to a general consensus that these are good improvements, I'll start
looking more actively on how to bring back the "spider"/source-check feature,
which hopefully shouldn't be to much trouble.

Regards,
- Maxime

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/6] Remove the spider feature
  2010-07-20 11:33 [Buildroot] [RESEND/PATCH] Git/Svn downloaders Maxime Petazzoni
@ 2010-07-20 11:33 ` Maxime Petazzoni
  2010-07-20 11:33 ` [Buildroot] [PATCH 2/6] Cleanup the VCS commands configuration Maxime Petazzoni
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-20 11:33 UTC (permalink / raw)
  To: buildroot

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 <maxime.petazzoni@bulix.org>
---
 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 f6e02bc..1ed02b7 100644
--- a/Makefile
+++ b/Makefile
@@ -243,7 +243,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)
@@ -436,11 +436,10 @@ endif
 source: $(TARGETS_SOURCE) $(HOST_SOURCE)
 
 _source-check:
-	$(MAKE) SPIDER=--spider source
+	@echo "TODO $@"
 
 external-deps:
-	@$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \
-		SPIDER=--spider source
+	@echo "TODO $@"
 
 show-targets:
 	@echo $(TARGETS)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index d76b791..ba0fd84 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 a7834dd..b7b80a5 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))
-- 
1.6.3.3.346.g8a41d

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 2/6] Cleanup the VCS commands configuration
  2010-07-20 11:33 [Buildroot] [RESEND/PATCH] Git/Svn downloaders Maxime Petazzoni
  2010-07-20 11:33 ` [Buildroot] [PATCH 1/6] Remove the spider feature Maxime Petazzoni
@ 2010-07-20 11:33 ` Maxime Petazzoni
  2010-07-20 11:33 ` [Buildroot] [PATCH 3/6] Update defconfigs with new VCS config options Maxime Petazzoni
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-20 11:33 UTC (permalink / raw)
  To: buildroot

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 <maxime.petazzoni@bulix.org>
---
 Config.in |   24 ++++++++----------------
 Makefile  |    6 ++----
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Config.in b/Config.in
index 6adfe49..0ca11dd 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 1ed02b7..6342aa6 100644
--- a/Makefile
+++ b/Makefile
@@ -244,10 +244,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))
-- 
1.6.3.3.346.g8a41d

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 3/6] Update defconfigs with new VCS config options
  2010-07-20 11:33 [Buildroot] [RESEND/PATCH] Git/Svn downloaders Maxime Petazzoni
  2010-07-20 11:33 ` [Buildroot] [PATCH 1/6] Remove the spider feature Maxime Petazzoni
  2010-07-20 11:33 ` [Buildroot] [PATCH 2/6] Cleanup the VCS commands configuration Maxime Petazzoni
@ 2010-07-20 11:33 ` Maxime Petazzoni
  2010-07-20 11:33 ` [Buildroot] [PATCH 4/6] Implement basic non-wget download methods Maxime Petazzoni
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-20 11:33 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
---
 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 3062541..31ec1d0 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 98158b9..ff324e7 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 fec2c04..20eb6a7 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 c73e372..7383a53 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 f1d63df..7482fb9 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 540eef6..f3c17ed 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 91cdedd..6dc741a 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 0d2fa0b..1d781a8 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 ab8851f..b83e0a7 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 ca9a65c..f695d3a 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 6b4f592..9cf3f4f 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 2578b95..40f0fe5 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 3f6c3b8..faa221c 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 92171d5..2069fba 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 49a5124..ab0b725 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 bd96723..aeb8973 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 f5eba61..8dc2818 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 d1db2da..058a04c 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 b90761b..bf6489d 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 c12ccf8..51f0598 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 65825be..ac93174 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 31ce604..6aefa8c 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 2eb22c5..87de60b 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 e44ac5f..ece9e09 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 2895d8a..66985a9 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 80f194a..0c777c7 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=""
-- 
1.6.3.3.346.g8a41d

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 4/6] Implement basic non-wget download methods
  2010-07-20 11:33 [Buildroot] [RESEND/PATCH] Git/Svn downloaders Maxime Petazzoni
                   ` (2 preceding siblings ...)
  2010-07-20 11:33 ` [Buildroot] [PATCH 3/6] Update defconfigs with new VCS config options Maxime Petazzoni
@ 2010-07-20 11:33 ` Maxime Petazzoni
  2010-07-26 17:14   ` Quotient Remainder
  2010-07-20 11:33 ` [Buildroot] [PATCH 5/6] Use the normal download method for Tremor Maxime Petazzoni
                   ` (2 subsequent siblings)
  6 siblings, 1 reply; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-20 11:33 UTC (permalink / raw)
  To: buildroot

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 <maxime.petazzoni@bulix.org>
---
 package/Makefile.package.in |   68 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index ba0fd84..fc76156 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -69,6 +69,35 @@ 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 > $($(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
 # 2) Download site
@@ -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
-- 
1.6.3.3.346.g8a41d

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 5/6] Use the normal download method for Tremor
  2010-07-20 11:33 [Buildroot] [RESEND/PATCH] Git/Svn downloaders Maxime Petazzoni
                   ` (3 preceding siblings ...)
  2010-07-20 11:33 ` [Buildroot] [PATCH 4/6] Implement basic non-wget download methods Maxime Petazzoni
@ 2010-07-20 11:33 ` Maxime Petazzoni
  2010-07-20 11:33 ` [Buildroot] [PATCH 6/6] Use the normal download method for libsvgtiny Maxime Petazzoni
  2010-07-21 20:55 ` [Buildroot] [RESEND/PATCH] Git/Svn downloaders Luca Ceresoli
  6 siblings, 0 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-20 11:33 UTC (permalink / raw)
  To: buildroot

Now that the generic download method supports Subversion, fall back to
the normal usage of AUTOTARGETS for Tremor.

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
---
 package/multimedia/tremor/tremor.mk |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/package/multimedia/tremor/tremor.mk b/package/multimedia/tremor/tremor.mk
index 74fd725..654a403 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))
-- 
1.6.3.3.346.g8a41d

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 6/6] Use the normal download method for libsvgtiny
  2010-07-20 11:33 [Buildroot] [RESEND/PATCH] Git/Svn downloaders Maxime Petazzoni
                   ` (4 preceding siblings ...)
  2010-07-20 11:33 ` [Buildroot] [PATCH 5/6] Use the normal download method for Tremor Maxime Petazzoni
@ 2010-07-20 11:33 ` Maxime Petazzoni
  2010-07-21 20:55 ` [Buildroot] [RESEND/PATCH] Git/Svn downloaders Luca Ceresoli
  6 siblings, 0 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-20 11:33 UTC (permalink / raw)
  To: buildroot

Now that the generic download method supports Subversion, fall back to
the normal usage of AUTOTARGETS for libsvgtiny.

Signed-off-by: Maxime Petazzoni <maxime.petazzoni@bulix.org>
---
 package/libsvgtiny/libsvgtiny.mk |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/package/libsvgtiny/libsvgtiny.mk b/package/libsvgtiny/libsvgtiny.mk
index b559e52..d9ac41b 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
-- 
1.6.3.3.346.g8a41d

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [RESEND/PATCH] Git/Svn downloaders
  2010-07-20 11:33 [Buildroot] [RESEND/PATCH] Git/Svn downloaders Maxime Petazzoni
                   ` (5 preceding siblings ...)
  2010-07-20 11:33 ` [Buildroot] [PATCH 6/6] Use the normal download method for libsvgtiny Maxime Petazzoni
@ 2010-07-21 20:55 ` Luca Ceresoli
  2010-07-26  8:25   ` Maxime Petazzoni
  6 siblings, 1 reply; 14+ messages in thread
From: Luca Ceresoli @ 2010-07-21 20:55 UTC (permalink / raw)
  To: buildroot

Maxime Petazzoni ha scritto:
> Hi,
>
> Integrating the feedback from the first series sent last week, here 
> comes the
> promised resend.
Based on the discussions so far, I think this is a good starting point.

Acked-by: Luca Ceresoli <luca@lucaceresoli.net>



> What changed from the first batch?
>
> - the BR2_GIT, BR2_SVN_CO and BR2_SVN_UP configuration options have been
> cleaned up into BR2_GIT="git" and BR2_SVN="svn" and the defconfig files
> updated (I know there has been some discussion about the defconfigs
> recently on the list... this seems to be a hot subject in the community
> right now :-)
>
> - the download method autodetection from the URI scheme has been added,
> taken from Luca's patch and integrated into mine.
>
> - tar --exclude-cvs is no longer used, in favor of per-VCS techniques:
> * `git archive --format=tar ... | gzip -c ...` for Git
> * `svn export ... && tar czf ...` for Subversion
>
> - libsvgtiny now benefits from the download method autodetection
>
>
> Once we get to a general consensus that these are good improvements, 
> I'll start
> looking more actively on how to bring back the "spider"/source-check 
> feature,
> which hopefully shouldn't be to much trouble.
I'm not using it, so I can't judge whether this is a problem or not.

Peter?

Luca


> Regards,
> - Maxime
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
>

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [RESEND/PATCH] Git/Svn downloaders
  2010-07-21 20:55 ` [Buildroot] [RESEND/PATCH] Git/Svn downloaders Luca Ceresoli
@ 2010-07-26  8:25   ` Maxime Petazzoni
  0 siblings, 0 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-26  8:25 UTC (permalink / raw)
  To: buildroot

* Luca Ceresoli <list@lucaceresoli.net> [2010-07-21 22:55:48]:

> Maxime Petazzoni ha scritto:
> >Hi,
> >
> >Integrating the feedback from the first series sent last week,
> >here comes the
> >promised resend.
> Based on the discussions so far, I think this is a good starting point.
> 
> Acked-by: Luca Ceresoli <luca@lucaceresoli.net>

Thanks. What's next to get these patches integrated? Do I need to make
my git tree available and send a pull request, or are the patches
enough?

> >Once we get to a general consensus that these are good
> >improvements, I'll start
> >looking more actively on how to bring back the
> >"spider"/source-check feature,
> >which hopefully shouldn't be to much trouble.
> I'm not using it, so I can't judge whether this is a problem or not.

I'll start another thread on the spider/source-check features so we all
agree on what they should be doing before I start implementing anything.

- Maxime
-- 
Maxime Petazzoni <http://www.bulix.org>
 ``One by one, the penguins took away my sanity.''
Linux kernel and software developer at MontaVista Software
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100726/21614583/attachment.pgp>

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 4/6] Implement basic non-wget download methods
  2010-07-20 11:33 ` [Buildroot] [PATCH 4/6] Implement basic non-wget download methods Maxime Petazzoni
@ 2010-07-26 17:14   ` Quotient Remainder
  2010-07-26 17:32     ` Maxime Petazzoni
  0 siblings, 1 reply; 14+ messages in thread
From: Quotient Remainder @ 2010-07-26 17:14 UTC (permalink / raw)
  To: buildroot

Ar M?irt, 2010-07-20 ag 13:33 +0200, scr?obh Maxime Petazzoni:
> 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.
> ...

Maxime, if I'm reading this right, the package source archive gets
created in the downloaded directory $($(PKG)_DL_DIR) instead of
$(DL_DIR) and so gets removed as soon as it's created by the "rm
-rf ...".
The following patch to your patch may be needed.

diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index fc76156..5444472 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -79,7 +79,7 @@ define DOWNLOAD_GIT
        $(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 > $($(PKG)_SOURCE) && \
+               gzip -c > $(DL_DIR)/$($(PKG)_SOURCE) && \
        popd > /dev/null && \
        rm -rf $($(PKG)_DL_DIR) && \
        popd > /dev/null

^ permalink raw reply related	[flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 4/6] Implement basic non-wget download methods
  2010-07-26 17:14   ` Quotient Remainder
@ 2010-07-26 17:32     ` Maxime Petazzoni
  0 siblings, 0 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-07-26 17:32 UTC (permalink / raw)
  To: buildroot

* Quotient Remainder <quotientvremainder@gmail.com> [2010-07-26 18:14:14]:

> Maxime, if I'm reading this right, the package source archive gets
> created in the downloaded directory $($(PKG)_DL_DIR) instead of
> $(DL_DIR) and so gets removed as soon as it's created by the "rm
> -rf ...".
> The following patch to your patch may be needed.

Nice catch! I'll fix my patch series.

It seems this won't get into 2010.08 anyway, so I'll have the time to
work on the spider/source-check/external-deps features for the next
release too.

Thanks,
- Maxime
-- 
Maxime Petazzoni <http://www.bulix.org>
 ``One by one, the penguins took away my sanity.''
Linux kernel and software developer at MontaVista Software
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100726/d97915b7/attachment.pgp>

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [RESEND/PATCH] Git/Svn downloaders
@ 2010-09-02 10:09 Maxime Petazzoni
  2010-09-02 12:03 ` Thomas Petazzoni
  0 siblings, 1 reply; 14+ messages in thread
From: Maxime Petazzoni @ 2010-09-02 10:09 UTC (permalink / raw)
  To: buildroot

Hi all,

Now that Buildroot 2010.08 is out (nice work on the release by the way!), I've
rebased my patchset for Git and Subversion downloaders on the latest HEAD.

I've also renamed SPIDER_MODE to DL_MODE, which better represents what this
variable is for (per Thomas' recommendation).

Regards,
- Maxime

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [RESEND/PATCH] Git/Svn downloaders
  2010-09-02 10:09 Maxime Petazzoni
@ 2010-09-02 12:03 ` Thomas Petazzoni
  2010-09-07 14:58   ` Maxime Petazzoni
  0 siblings, 1 reply; 14+ messages in thread
From: Thomas Petazzoni @ 2010-09-02 12:03 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu,  2 Sep 2010 12:09:43 +0200
Maxime Petazzoni <maxime.petazzoni@bulix.org> wrote:

> Now that Buildroot 2010.08 is out (nice work on the release by the
> way!), I've rebased my patchset for Git and Subversion downloaders on
> the latest HEAD.
> 
> I've also renamed SPIDER_MODE to DL_MODE, which better represents
> what this variable is for (per Thomas' recommendation).

FWIW, I've pushed this patch set at:

 http://git.buildroot.net/~tpetazzoni/git/buildroot/log/?h=for-2010.11/download-rework

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 14+ messages in thread
* [Buildroot] [RESEND/PATCH] Git/Svn downloaders
  2010-09-02 12:03 ` Thomas Petazzoni
@ 2010-09-07 14:58   ` Maxime Petazzoni
  0 siblings, 0 replies; 14+ messages in thread
From: Maxime Petazzoni @ 2010-09-07 14:58 UTC (permalink / raw)
  To: buildroot

* Thomas Petazzoni <thomas.petazzoni@free-electrons.com> [2010-09-02 14:03:40]:

> FWIW, I've pushed this patch set at:
> 
>  http://git.buildroot.net/~tpetazzoni/git/buildroot/log/?h=for-2010.11/download-rework

Thanks!

- Maxime
-- 
Maxime Petazzoni <http://www.bulix.org>
 ``One by one, the penguins took away my sanity.''
Linux kernel and software developer at MontaVista Software
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100907/4ed0ccff/attachment.pgp>

^ permalink raw reply	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-09-07 14:58 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-20 11:33 [Buildroot] [RESEND/PATCH] Git/Svn downloaders Maxime Petazzoni
2010-07-20 11:33 ` [Buildroot] [PATCH 1/6] Remove the spider feature Maxime Petazzoni
2010-07-20 11:33 ` [Buildroot] [PATCH 2/6] Cleanup the VCS commands configuration Maxime Petazzoni
2010-07-20 11:33 ` [Buildroot] [PATCH 3/6] Update defconfigs with new VCS config options Maxime Petazzoni
2010-07-20 11:33 ` [Buildroot] [PATCH 4/6] Implement basic non-wget download methods Maxime Petazzoni
2010-07-26 17:14   ` Quotient Remainder
2010-07-26 17:32     ` Maxime Petazzoni
2010-07-20 11:33 ` [Buildroot] [PATCH 5/6] Use the normal download method for Tremor Maxime Petazzoni
2010-07-20 11:33 ` [Buildroot] [PATCH 6/6] Use the normal download method for libsvgtiny Maxime Petazzoni
2010-07-21 20:55 ` [Buildroot] [RESEND/PATCH] Git/Svn downloaders Luca Ceresoli
2010-07-26  8:25   ` Maxime Petazzoni
  -- strict thread matches above, loose matches on Subject: below --
2010-09-02 10:09 Maxime Petazzoni
2010-09-02 12:03 ` Thomas Petazzoni
2010-09-07 14:58   ` Maxime Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox