projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace the deprecated git-* command calls with git *
[openwrt-10.03/.git]
/
include
/
download.mk
diff --git
a/include/download.mk
b/include/download.mk
index b93b774b97380dba0c34ebce9fc9a2c18dd4e4a3..b185f1ac36805ddb4de5924e4f7c47102da2582e 100644
(file)
--- a/
include/download.mk
+++ b/
include/download.mk
@@
-16,6
+16,7
@@
$(strip \
$(if $(filter svn://%,$(1)),svn, \
$(if $(filter cvs://%,$(1)),cvs, \
unknown \
$(if $(filter svn://%,$(1)),svn, \
$(if $(filter cvs://%,$(1)),cvs, \
unknown \
+ ) \
) \
) \
) \
) \
) \
) \
@@
-40,7
+41,7
@@
define DownloadMethod/default
endef
define wrap_mirror
endef
define wrap_mirror
-
@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ( $(1)
)
+
$(if $(MIRROR),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ( $(1) ),$(1)
)
endef
define DownloadMethod/cvs
endef
define DownloadMethod/cvs
@@
-66,7
+67,7
@@
define DownloadMethod/svn
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
- svn co -r$(VERSION) $(URL) $(SUBDIR) && \
+ svn co -
-non-interactive -
r$(VERSION) $(URL) $(SUBDIR) && \
find $(SUBDIR) -name .svn | xargs rm -rf && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
find $(SUBDIR) -name .svn | xargs rm -rf && \
echo "Packing checkout..." && \
$(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) && \
@@
-81,8
+82,8
@@
define DownloadMethod/git
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
cd $(TMP_DIR)/dl && \
rm -rf $(SUBDIR) && \
[ \! -d $(SUBDIR) ] && \
- git
-
clone $(URL) $(SUBDIR) && \
- (cd $(SUBDIR) && git
-
checkout $(VERSION)) && \
+ git
clone $(URL) $(SUBDIR) && \
+ (cd $(SUBDIR) && git
checkout $(VERSION)) && \
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)) && \
@@
-100,6
+101,7
@@
define Download/Defaults
PROTO:=
MD5SUM:=
SUBDIR:=
PROTO:=
MD5SUM:=
SUBDIR:=
+ MIRROR:=1
VERSION:=
endef
VERSION:=
endef