aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-12-14 17:11:03 +0100
committerFelix Fietkau <nbd@nbd.name>2016-12-16 13:49:24 +0100
commit7416d2e046b87b262b407f8af70b8dd9b2927c70 (patch)
tree783aef584f3cd2f98226360eda5e2631e319ef4c
parentaada15af93db6bfb248239f011bafe22c613fbf3 (diff)
downloadupstream-7416d2e046b87b262b407f8af70b8dd9b2927c70.tar.gz
upstream-7416d2e046b87b262b407f8af70b8dd9b2927c70.tar.bz2
upstream-7416d2e046b87b262b407f8af70b8dd9b2927c70.zip
build: replace MD5SUM variables with HASH
Since we've switched to preferring SHA256 over MD5, the old variable name is misleading. Packages using the old name remain compatible. Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--include/download.mk6
-rw-r--r--include/package.mk4
2 files changed, 7 insertions, 3 deletions
diff --git a/include/download.mk b/include/download.mk
index 3c6b4a20cf..0a12c69ebd 100644
--- a/include/download.mk
+++ b/include/download.mk
@@ -49,11 +49,11 @@ define DownloadMethod/unknown
endef
define DownloadMethod/default
- $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MD5SUM)" "$(URL_FILE)" $(foreach url,$(URL),"$(url)")
+ $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(HASH)" "$(URL_FILE)" $(foreach url,$(URL),"$(url)")
endef
define wrap_mirror
-$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" "" || ( $(1) ),$(1))
+$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_HASH))),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_HASH)" "" || ( $(1) ),$(1))
endef
define DownloadMethod/cvs
@@ -170,9 +170,11 @@ define Download/Defaults
FILE:=
URL_FILE:=
PROTO:=
+ HASH=$$(MD5SUM)
MD5SUM:=
SUBDIR:=
MIRROR:=1
+ MIRROR_HASH=$$(MIRROR_MD5SUM)
MIRROR_MD5SUM:=x
VERSION:=
OPTS:=
diff --git a/include/package.mk b/include/package.mk
index 99e401e859..bc621a1787 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -125,8 +125,10 @@ define Download/default
PROTO:=$(PKG_SOURCE_PROTO)
$(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
$(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
+ $(if $(PKG_MIRROR_HASH),MIRROR_HASH:=$(PKG_MIRROR_HASH))
VERSION:=$(PKG_SOURCE_VERSION)
- MD5SUM:=$(PKG_MD5SUM)
+ $(if $(PKG_MD5SUM),MD5SUM:=$(PKG_MD5SUM))
+ $(if $(PKG_HASH),HASH:=$(PKG_HASH))
endef
ifdef USE_GIT_TREE