ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tool/ports: streamline hash tool usage

Browse Source
This commit is contained in:
Christian Helmuth 2018-05-15 15:37:24 +02:00
parent 82897d672e
commit 66d44289e1
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tool/ports/mk/check.mk
View File

@ -12,11 +12,6 @@
check: check:
#
# Utility to check if a tool is installed
#
check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.))
$(call check_tool,curl) $(call check_tool,curl)
$(call check_tool,git) $(call check_tool,git)
$(call check_tool,svn) $(call check_tool,svn)

6
tool/ports/mk/common.inc
View File

@ -7,7 +7,6 @@
SHELL := bash SHELL := bash
VERBOSE ?= @ VERBOSE ?= @
ECHO := echo -e ECHO := echo -e
HASHSUM := sha1sum
BRIGHT_COL ?= \x1b[01;33m BRIGHT_COL ?= \x1b[01;33m
DARK_COL ?= \x1b[00;33m DARK_COL ?= \x1b[00;33m
@ -25,3 +24,8 @@ MSG_GIT := $(MSG_PREFIX_TXT)git
# Force stable sorting order # Force stable sorting order
export LC_COLLATE=C export LC_COLLATE=C
#
# Utility to check if a tool is installed
#
check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.))

4
tool/ports/mk/hash.inc
View File

@ -15,6 +15,8 @@
# STRICT_HASH to 'no', the MAKEFILE_LIST can be exluded. # STRICT_HASH to 'no', the MAKEFILE_LIST can be exluded.
# #
$(call check_tool,sha1sum)
_PATCHES_IN_REP_DIR := $(foreach P,$(PATCHES),\ _PATCHES_IN_REP_DIR := $(foreach P,$(PATCHES),\
$(wildcard $(REP_DIR)/$(subst $(REP_DIR)/,,$(P)))) $(wildcard $(REP_DIR)/$(subst $(REP_DIR)/,,$(P))))
@ -25,7 +27,7 @@ endif
$(_DST_HASH_FILE): $(HASH_INPUT) $(MAKEFILE_LIST) $(_DST_HASH_FILE): $(HASH_INPUT) $(MAKEFILE_LIST)
@$(MSG_GENERATE)$(notdir $@) @$(MSG_GENERATE)$(notdir $@)
$(VERBOSE)cat $(HASH_INPUT) | $(HASHSUM) | sed "s/ .*//" > $@ $(VERBOSE)cat $(HASH_INPUT) | sha1sum | sed "s/ .*//" > $@
_check_hash: $(_DST_HASH_FILE) _check_hash: $(_DST_HASH_FILE)
ifneq ($(CHECK_HASH),no) ifneq ($(CHECK_HASH),no)

7
tool/ports/mk/install.mk
View File

@ -20,11 +20,6 @@
# XXX remove this line when the tool has stabilized # XXX remove this line when the tool has stabilized
STRICT_HASH ?= no STRICT_HASH ?= no
#
# Utility to check if a tool is installed
#
check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.))
# #
# Utility to check if a python module is installed # Utility to check if a python module is installed
# #
@ -59,9 +54,7 @@ include $(GENODE_DIR)/tool/ports/mk/common.inc
$(call check_tool,wget) $(call check_tool,wget)
$(call check_tool,patch) $(call check_tool,patch)
$(call check_tool,sha1sum)
$(call check_tool,sha256sum) $(call check_tool,sha256sum)
$(call check_tool,$(HASHSUM))
# #
# Assertion for the presence of a LICENSE and VERSION declarations in the port # Assertion for the presence of a LICENSE and VERSION declarations in the port