From e15565a01cea6a61c537f5fb91c4e4d27fb7b290 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Fri, 29 Jun 2018 13:49:34 +0800 Subject: [PATCH] download.mk: restore the old dl_method implementation Seems like the python download.py dl_method call causes serious performance regression for fresh "make defconfig" as reported in FS#1621. GitHub tarball download will also be disabled with this Signed-off-by: Yousong Zhou --- include/download.mk | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/download.mk b/include/download.mk index 91a22c2316..3634e777c9 100644 --- a/include/download.mk +++ b/include/download.mk @@ -21,7 +21,23 @@ DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) # Try to guess the download method from the URL define dl_method -$(shell $(SCRIPT_DIR)/download.py dl_method --url $(foreach url,$(1),"$(url)") --proto="$(2)") +$(strip \ + $(if $(2),$(2), \ + $(if $(filter @APACHE/% @GITHUB/% @GNOME/% @GNU/% @KERNEL/% @SF/% @SAVANNAH/% ftp://% http://% https://% file://%,$(1)),default, \ + $(if $(filter git://%,$(1)),git, \ + $(if $(filter svn://%,$(1)),svn, \ + $(if $(filter cvs://%,$(1)),cvs, \ + $(if $(filter hg://%,$(1)),hg, \ + $(if $(filter sftp://%,$(1)),bzr, \ + unknown \ + ) \ + ) \ + ) \ + ) \ + ) \ + ) \ + ) \ +) endef # code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support