[package] firewall: protect iptables invocations with locks in interface ops, it...

[openwrt.git] / include / download.mk

diff --git a/include/download.mk b/include/download.mk
index a50a5e9..9dd26a7 100644 (file)
--- a/include/download.mk
+++ b/include/download.mk
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,7 +8,7 @@
 DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
 
 # Try to guess the download method from the URL
 DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)
 
 # Try to guess the download method from the URL

-define dl_method 
+define dl_method

 $(strip \
   $(if $(2),$(2), \
     $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \
 $(strip \
   $(if $(2),$(2), \
     $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://% file://%,$(1)),default, \


@@ -16,9 +16,11 @@ $(strip \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \
             $(if $(filter hg://%,$(1)),hg, \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \
             $(if $(filter hg://%,$(1)),hg, \

-              unknown \
-           ) \
-         ) \
+              $(if $(filter sftp://%,$(1)),bzr, \
+                unknown \
+              ) \
+            ) \
+          ) \

         ) \
       ) \
     ) \
         ) \
       ) \
     ) \


@@ -26,7 +28,7 @@ $(strip \
 )
 endef
 
 )
 endef
 

-# code for creating tarballs from cvs/svn/git/hg checkouts - useful for mirror support
+# code for creating tarballs from cvs/svn/git/bzr/hg checkouts - useful for mirror support

 dl_pack/bz2=$(TAR) cfj $(1) $(2)
 dl_pack/gz=$(TAR) cfz $(1) $(2)
 dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false
 dl_pack/bz2=$(TAR) cfj $(1) $(2)
 dl_pack/gz=$(TAR) cfz $(1) $(2)
 dl_pack/unknown=echo "ERROR: Unknown pack format for file $(1)"; false


@@ -49,19 +51,18 @@ endef
 define DownloadMethod/cvs
        $(call wrap_mirror, \
                echo "Checking out files from the cvs repository..."; \
 define DownloadMethod/cvs
        $(call wrap_mirror, \
                echo "Checking out files from the cvs repository..."; \

-                mkdir -p $(TMP_DIR)/dl && \
-                cd $(TMP_DIR)/dl && \
-                rm -rf $(SUBDIR) && \
-                [ \! -d $(SUBDIR) ] && \
-                cvs -d $(URL) co $(VERSION) $(SUBDIR) && \
-                find $(SUBDIR) -name CVS | xargs rm -rf && \
-                echo "Packing checkout..." && \
-                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
-                mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
-        )
+               mkdir -p $(TMP_DIR)/dl && \
+               cd $(TMP_DIR)/dl && \
+               rm -rf $(SUBDIR) && \
+               [ \! -d $(SUBDIR) ] && \
+               cvs -d $(URL) export $(VERSION) $(SUBDIR) && \
+               echo "Packing checkout..." && \
+               $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \
+       )

 endef
 
 endef
 

-

 define DownloadMethod/svn
        $(call wrap_mirror, \
                echo "Checking out files from the svn repository..."; \
 define DownloadMethod/svn
        $(call wrap_mirror, \
                echo "Checking out files from the svn repository..."; \


@@ -69,11 +70,13 @@ define DownloadMethod/svn
                cd $(TMP_DIR)/dl && \
                rm -rf $(SUBDIR) && \
                [ \! -d $(SUBDIR) ] && \
                cd $(TMP_DIR)/dl && \
                rm -rf $(SUBDIR) && \
                [ \! -d $(SUBDIR) ] && \

-               svn co --non-interactive -r$(VERSION) $(URL) $(SUBDIR) && \
-               find $(SUBDIR) -name .svn | xargs rm -rf && \
+               ( svn help export | grep -q trust-server-cert && \
+               svn export --non-interactive --trust-server-cert -r$(VERSION) $(URL) $(SUBDIR) || \
+               svn export --non-interactive -r$(VERSION) $(URL) $(SUBDIR) ) && \

                echo "Packing checkout..." && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
                echo "Packing checkout..." && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \

-               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \

        )
 endef
 
        )
 endef
 


@@ -89,7 +92,23 @@ define DownloadMethod/git
                echo "Packing checkout..." && \
                rm -rf $(SUBDIR)/.git && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
                echo "Packing checkout..." && \
                rm -rf $(SUBDIR)/.git && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \

-               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \
+       )
+endef
+
+define DownloadMethod/bzr
+       $(call wrap_mirror, \
+               echo "Checking out files from the bzr repository..."; \
+               mkdir -p $(TMP_DIR)/dl && \
+               cd $(TMP_DIR)/dl && \
+               rm -rf $(SUBDIR) && \
+               [ \! -d $(SUBDIR) ] && \
+               bzr export -r$(VERSION) $(SUBDIR) $(URL) && \
+               echo "Packing checkout..." && \
+               $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \

        )
 endef
 
        )
 endef
 


@@ -104,13 +123,15 @@ define DownloadMethod/hg
                find $(SUBDIR) -name .hg | xargs rm -rf && \
                echo "Packing checkout..." && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
                find $(SUBDIR) -name .hg | xargs rm -rf && \
                echo "Packing checkout..." && \
                $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \

-               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/; \
+               mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ && \
+               rm -rf $(SUBDIR); \

        )
 endef
 
 Validate/cvs=VERSION SUBDIR
 Validate/svn=VERSION SUBDIR
 Validate/git=VERSION SUBDIR
        )
 endef
 
 Validate/cvs=VERSION SUBDIR
 Validate/svn=VERSION SUBDIR
 Validate/git=VERSION SUBDIR

+Validate/bzr=VERSION SUBDIR

 Validate/hg=VERSION SUBDIR
 
 define Download/Defaults
 Validate/hg=VERSION SUBDIR
 
 define Download/Defaults