X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fdownload.mk;h=2ba8a7bdf48e6f0a2ef8a5076b941ded58821555;hb=61b977fa2cc30ad3ef7a1975cdc60bb86c550958;hp=09b929bd777c54c7d28f67264305c88e1336564f;hpb=ffb0181a8731847ea0d02d6e158adf3d7d95c382;p=openwrt%2Fopenwrt.git diff --git a/include/download.mk b/include/download.mk index 09b929bd77..2ba8a7bdf4 100644 --- a/include/download.mk +++ b/include/download.mk @@ -6,8 +6,10 @@ # See /LICENSE for more information. # -OPENWRT_GIT = http://git.openwrt.org -LEDE_GIT = https://git.lede-project.org +PROJECT_GIT = https://git.openwrt.org + +OPENWRT_GIT = $(PROJECT_GIT) +LEDE_GIT = $(PROJECT_GIT) ifdef PKG_SOURCE_VERSION PKG_VERSION ?= $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION)) @@ -61,7 +63,7 @@ else check_warn = $(if $(filter-out undefined,$(origin F_$(1))),$(filter ,$(shell $(call F_$(1),$(2),$(3),$(4)) >&2)),$(check_warn_nofix)) endif -gen_sha256sum = $(shell openssl dgst -sha256 $(DL_DIR)/$(1) | awk '{print $$2}') +gen_sha256sum = $(shell mkhash sha256 $(DL_DIR)/$(1)) ifdef FIXUP F_hash_deprecated = $(SCRIPT_DIR)/fixup-makefile.pl $(CURDIR)/Makefile fix-hash $(3) $(call gen_sha256sum,$(1)) $(2) @@ -94,19 +96,16 @@ endif C_md5_deprecated = Use of $(2) is deprecated, switch to $(3) -# Skip MD5SUM check in feeds until OpenWrt is updated -ifneq ($(filter $(foreach dir,package tools toolchain, $(TOPDIR)/$(dir)/%),$(CURDIR)),) check_md5 = \ $(if $(filter-out x,$(1)), \ $(call check_warn,md5_deprecated,$(1),$(2),$(3)) \ ) -endif hash_var = $(if $(filter-out x,$(1)),MD5SUM,HASH) endif define DownloadMethod/unknown - @echo "ERROR: No download method available"; false + echo "ERROR: No download method available"; false endef define DownloadMethod/default