remove patch missed from [12498] only needed for ipkg support

[openwrt.git] / include / download.mk

diff --git a/include/download.mk b/include/download.mk
index b185f1a..7a4d90d 100644 (file)
--- a/include/download.mk
+++ b/include/download.mk
@@ -11,11 +11,13 @@ DOWNLOAD_RDEP:=$(STAMP_PREPARED)
 define dl_method 
 $(strip \
   $(if $(2),$(2), \
 define dl_method 
 $(strip \
   $(if $(2),$(2), \

-    $(if $(filter @GNU/% @KERNEL/% @SF/% ftp://% http://%,$(1)),default, \
+    $(if $(filter @GNOME/% @GNU/% @KERNEL/% @SF/% ftp://% http://%,$(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, \
+              unknown \
+           ) \

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


@@ -24,7 +26,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/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


@@ -51,7 +53,7 @@ define DownloadMethod/cvs
                 cd $(TMP_DIR)/dl && \
                 rm -rf $(SUBDIR) && \
                 [ \! -d $(SUBDIR) ] && \
                 cd $(TMP_DIR)/dl && \
                 rm -rf $(SUBDIR) && \
                 [ \! -d $(SUBDIR) ] && \

-                cvs co -r$(VERSION) $(URL) $(SUBDIR) && \
+                cvs -d $(URL) co -r $(VERSION) $(SUBDIR) && \

                 find $(SUBDIR) -name CVS | xargs rm -rf && \
                 echo "Packing checkout..." && \
                 $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
                 find $(SUBDIR) -name CVS | xargs rm -rf && \
                 echo "Packing checkout..." && \
                 $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \


@@ -91,9 +93,25 @@ define DownloadMethod/git
        )
 endef
 
        )
 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)/; \
+       )
+endef
+

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

+Validate/hg=VERSION SUBDIR

 
 define Download/Defaults
   URL:=
 
 define Download/Defaults
   URL:=