tool/ports: customization hooks

The hooks added by this patch allow for the reuse of the hash.inc and
install.mk by Goa as is.
This commit is contained in:
Norman Feske 2022-05-17 13:44:29 +02:00 committed by Christian Helmuth
parent f9a29f291e
commit 19b6f88c33
2 changed files with 7 additions and 3 deletions
tool/ports/mk

View File

@ -17,6 +17,8 @@
$(call check_tool,sha1sum) $(call check_tool,sha1sum)
REDIR ?= > $@
_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))))
@ -27,7 +29,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) | sha1sum | sed "s/ .*//" > $@ $(VERBOSE)cat $(HASH_INPUT) | sha1sum | sed "s/ .*//" $(REDIR)
_check_hash: $(_DST_HASH_FILE) _check_hash: $(_DST_HASH_FILE)
ifneq ($(CHECK_HASH),no) ifneq ($(CHECK_HASH),no)

View File

@ -20,6 +20,8 @@
# XXX remove this line when the tool has stabilized # XXX remove this line when the tool has stabilized
STRICT_HASH ?= no STRICT_HASH ?= no
PORTS_TOOL_DIR ?= $(GENODE_DIR)/tool/ports
# #
# Utility to check if a python module is installed # Utility to check if a python module is installed
# #
@ -45,7 +47,7 @@ _prefer = $(if $1,$1,$2)
# #
# Include common definitions # Include common definitions
# #
include $(GENODE_DIR)/tool/ports/mk/common.inc include $(PORTS_TOOL_DIR)/mk/common.inc
# #
# Include definitions provided by the port description file # Include definitions provided by the port description file
@ -87,7 +89,7 @@ _dirs: $(DOWNLOADS)
## Generate the HASH file ## Generate the HASH file
## ##
include $(GENODE_DIR)/tool/ports/mk/hash.inc include $(PORTS_TOOL_DIR)/mk/hash.inc
## ##