summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-31 02:43:33 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-31 02:43:33 +0000
commit2f9873da2b03f73542edabf43a55e2327ba726e4 (patch)
treeacc96b72b88c3c77eec935f15247728f9e462188
parent808f115d372f508656eb47ac37dc4e208d548215 (diff)
allow packages to forcibly disable the svn/git mirror downloading attempt by setting PKG_SOURCE_MIRROR:=0 (#3815)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12034 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/download.mk3
-rw-r--r--include/package.mk1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/download.mk b/include/download.mk
index 74986be59..f064ee9e8 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -41,7 +41,7 @@ define DownloadMethod/default
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
@@ -101,6 +101,7 @@ define Download/Defaults
PROTO:=
MD5SUM:=
SUBDIR:=
+ MIRROR:=1
VERSION:=
endef
diff --git a/include/package.mk b/include/package.mk
index da8de5ccc..8819a1156 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -49,6 +49,7 @@ define Download/default
URL:=$(PKG_SOURCE_URL)
SUBDIR:=$(PKG_SOURCE_SUBDIR)
PROTO:=$(PKG_SOURCE_PROTO)
+ $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
VERSION:=$(PKG_SOURCE_VERSION)
MD5SUM:=$(PKG_MD5SUM)
endef