denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 12:32:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

tool/depot: make DEPOT_TOOL_DIR customizable

Browse Source 
By replacing the formerly hard-coded $(GENODE_DIR)/tool/depot/ by the
variable DEPOT_TOOL_DIR, the depot tools can be hosted outside the
Genode source tree, i.e., as part of the Goa tool.
This commit is contained in:
Norman Feske
2022-05-17 14:17:01 +02:00
committed by Christian Helmuth
parent 19b6f88c33
commit b081988e66
5 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tool/depot/publish
View File

@@ -28,11 +28,12 @@ endef
export GENODE_DIR := $(realpath $(dir $(MAKEFILE_LIST))/../..)
PUBLIC_DIR ?= $(GENODE_DIR)/public
PUBLIC_DIR ?= $(GENODE_DIR)/public
DEPOT_TOOL_DIR ?= $(GENODE_DIR)/tool/depot
XZ_THREADS ?= 1
include $(GENODE_DIR)/tool/depot/mk/front_end.inc
include $(DEPOT_TOOL_DIR)/mk/front_end.inc
#
@@ -40,7 +41,9 @@ include $(GENODE_DIR)/tool/depot/mk/front_end.inc
#
ifneq ($(MAKECMDGOALS),)
DEPENDENCIES_CMD := $(GENODE_DIR)/tool/depot/dependencies DEPOT_DIR="$(DEPOT_DIR)" $(MAKECMDGOALS)
DEPENDENCIES_CMD := $(DEPOT_TOOL_DIR)/dependencies DEPOT_DIR="$(DEPOT_DIR)" \
DEPOT_TOOL_DIR="$(DEPOT_TOOL_DIR)" \
$(MAKECMDGOALS)
DEPENDENCIES_RESULT := $(shell $(DEPENDENCIES_CMD) 2> /dev/null || true)
endif
@@ -85,7 +88,7 @@ index_missing_error:
# Generate compressed and signed archives and index files
#
include $(GENODE_DIR)/tool/depot/mk/gpg.inc
include $(DEPOT_TOOL_DIR)/mk/gpg.inc
MISSING_PUBKEY_FILES := $(sort \
$(foreach A,$(ARCHIVES),\