From b35b87009b4b82fd98fcc6259fdac5eb0ba4e5bf Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 11 Nov 2020 16:16:42 +0000 Subject: [PATCH] topdir.mk: Add pkg-manager targets Add targets also present in projects-dir.mk: - Pkg-manager-refresh - Pkg-manager-install-build-deps - Pkg-manager-install-release-deps Signed-off-by: Jan Lindemann --- make/topdir.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/make/topdir.mk b/make/topdir.mk index c1bac415..f8fa3c68 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -20,6 +20,7 @@ PROJECT_DESCR = $(TOPDIR)/make/project.conf GIT_DESCR = $(TOPDIR)/.git/description OPT_JANWARE_PROJECT ?= -j +PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) ifeq ($(OPT_JANWARE_PROJECT),-j) REMOTE_GIT_FLAVOUR ?= proj @@ -193,6 +194,15 @@ git-ssh-%: bash -c "`git remote get-url --push $* | sed 's|ssh://||; s|\([^/]\+\)/\(.*\)|LC_CDPATH=/\2 ssh -o SendEnv=LC_CDPATH \1|'`" git-ssh: git-ssh-origin +pkg-manager-refresh: + $(PKG_MANAGER_SH) refresh $(DASH_Y) + +pkg-install-build-deps: + $(PKG_MANAGER_SH) install $(DASH_Y) $(BASE_PKGS) $(shell $(proj_query_cmd) required-os-pkg --skip-excluded --flavours "build" $(PROJECT)) + +pkg-install-release-deps: + $(PKG_MANAGER_SH) install $(DASH_Y) $(BASE_PKGS) $(shell $(proj_query_cmd) required-os-pkg --skip-excluded --flavours "build run release" $(PROJECT)) + echo-hash: @/bin/bash $(PKG_SH_EXE) hash