From: nbd Date: Fri, 16 Nov 2007 04:10:01 +0000 (+0000) Subject: prefer http downloads over svn/git checkouts, remove git dependency X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/5698039c6bc30b0ff8920e6c559aff290dc12293?ds=sidebyside prefer http downloads over svn/git checkouts, remove git dependency git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9567 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/include/download.mk b/include/download.mk index 3c7cb7e77..23f2996ed 100644 --- a/include/download.mk +++ b/include/download.mk @@ -39,9 +39,7 @@ define DownloadMethod/default endef define wrap_mirror - @$(if $(CONFIG_LOCALMIRROR),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ) \ - ( $(1) ) \ - $(if $(CONFIG_LOCALMIRROR),, || $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x") + @$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "x" || ( $(1) ) endef define DownloadMethod/svn diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 9b77a1baf..1e448d393 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -119,14 +119,6 @@ $(eval $(call Require,gnutar, \ Please install GNU tar. \ )) -define Require/git - which git-clone -endef - -$(eval $(call Require,git, \ - Please install git. \ -)) - $(eval $(call RequireCommand,svn, \ Please install the subversion client. \ ))