diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-12-14 19:11:03 +0300 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-09 20:11:56 +0300 |
| commit | 00cf92d561b1058ef43615caace606b7245c264a (patch) | |
| tree | 72ac73a54bd5950c76a5c05f2313331ab59e9ced | |
| parent | 1a7b132013057ff38964c8ae1c27a36f24e4d9be (diff) | |
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.mk | 6 | ||||
| -rw-r--r-- | include/package.mk | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/download.mk b/include/download.mk index a359514002..f5ce51019c 100644 --- a/include/download.mk +++ b/include/download.mk @@ -44,11 +44,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 @@ -160,9 +160,11 @@ define Download/Defaults FILE:= URL_FILE:= PROTO:= + HASH=$$(MD5SUM) MD5SUM:= SUBDIR:= MIRROR:=1 + MIRROR_HASH=$$(MIRROR_MD5SUM) MIRROR_MD5SUM:=x VERSION:= endef diff --git a/include/package.mk b/include/package.mk index 4962bd68d1..94a2eb80bb 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 |