mac80211: update to wireless-testing 2010-05-12 plus some pending patches

[openwrt.git] / include / download.mk

diff --git a/include/download.mk b/include/download.mk
index b185f1a..9dd26a7 100644 (file)
--- a/include/download.mk
+++ b/include/download.mk
@@ -1,22 +1,26 @@
-# 
-# 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.
 #
 

-DOWNLOAD_RDEP:=$(STAMP_PREPARED)
+DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)

 
 # Try to guess the download method from the URL
 
 # Try to guess the download method from the URL

-define dl_method 
+define dl_method

 $(strip \
   $(if $(2),$(2), \
 $(strip \
   $(if $(2),$(2), \

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

       $(if $(filter git://%,$(1)),git, \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \
       $(if $(filter git://%,$(1)),git, \
         $(if $(filter svn://%,$(1)),svn, \
           $(if $(filter cvs://%,$(1)),cvs, \

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

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


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

-# code for creating tarballs from cvs/svn/git 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


@@ -47,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 co -r$(VERSION) $(URL) $(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..."; \


@@ -67,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
 


@@ -87,13 +92,47 @@ 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
+
+define DownloadMethod/hg
+       $(call wrap_mirror, \
+               echo "Checking out files from the hg repository..."; \
+               mkdir -p $(TMP_DIR)/dl && \
+               cd $(TMP_DIR)/dl && \
+               rm -rf $(SUBDIR) && \
+               [ \! -d $(SUBDIR) ] && \
+               hg clone -r $(VERSION) $(URL) $(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)/ && \
+               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
   URL:=
 
 define Download/Defaults
   URL:=


@@ -114,7 +153,9 @@ define Download
     endif
   )
 
     endif
   )
 

-  $(if $(DOWNLOAD_RDEP),$(DOWNLOAD_RDEP): $(DL_DIR)/$(FILE))
+  $(foreach dep,$(DOWNLOAD_RDEP),
+    $(dep): $(DL_DIR)/$(FILE)
+  )

   download: $(DL_DIR)/$(FILE)
 
   $(DL_DIR)/$(FILE):
   download: $(DL_DIR)/$(FILE)
 
   $(DL_DIR)/$(FILE):