KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build: replace MD5SUM variables with HASH

Browse source 
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>
This commit is contained in:
Felix Fietkau 2016-12-14 17:11:03 +01:00
parent aada15af93
commit 7416d2e046
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/download.mk
View file

@ -49,11 +49,11 @@ define DownloadMethod/unknown
endef endef
define DownloadMethod/default 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 endef
define wrap_mirror 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 endef
define DownloadMethod/cvs define DownloadMethod/cvs
@ -170,9 +170,11 @@ define Download/Defaults
FILE:= FILE:=
URL_FILE:= URL_FILE:=
PROTO:= PROTO:=
HASH=$$(MD5SUM)
MD5SUM:= MD5SUM:=
SUBDIR:= SUBDIR:=
MIRROR:=1 MIRROR:=1
MIRROR_HASH=$$(MIRROR_MD5SUM)
MIRROR_MD5SUM:=x MIRROR_MD5SUM:=x
VERSION:= VERSION:=
OPTS:= OPTS:=

4
include/package.mk
View file

@ -125,8 +125,10 @@ define Download/default
PROTO:=$(PKG_SOURCE_PROTO) PROTO:=$(PKG_SOURCE_PROTO)
$(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR))) $(if $(PKG_SOURCE_MIRROR),MIRROR:=$(filter 1,$(PKG_MIRROR)))
$(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM)) $(if $(PKG_MIRROR_MD5SUM),MIRROR_MD5SUM:=$(PKG_MIRROR_MD5SUM))
$(if $(PKG_MIRROR_HASH),MIRROR_HASH:=$(PKG_MIRROR_HASH))
VERSION:=$(PKG_SOURCE_VERSION) VERSION:=$(PKG_SOURCE_VERSION)
MD5SUM:=$(PKG_MD5SUM) $(if $(PKG_MD5SUM),MD5SUM:=$(PKG_MD5SUM))
$(if $(PKG_HASH),HASH:=$(PKG_HASH))
endef endef
ifdef USE_GIT_TREE ifdef USE_GIT_TREE