From ba8bd6d942dbbd3cbb1574baa3860b800dc3cd3d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 23 Oct 2018 14:40:25 +0000 Subject: [PATCH] projects-dir.mk: Add target pkg-exclude-installed Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 90729d43..fc20abb0 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -110,7 +110,7 @@ RELEASE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/build PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found) LIST_VCS_FILES = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/list-cvs-files.sh /opt/jw-build/bin/list-cvs-files.sh) list-cvs-files-not-found) -JANWARE_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/js-pkg /opt/jw-build/bin/jannet) jw-pkg-not-found) +JW_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found) BROWSER ?= xdg-open EDITOR ?= xdg-open GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh @@ -165,13 +165,16 @@ pkg-install-prereq-release: pkg-exclude-built-today: touch $(EXCLUDES_FILE) - $(JANWARE_PKG) built-today > built-today.tmp + $(JW_PKG) built-today > built-today.tmp cat $(EXCLUDES_FILE) built-today.tmp | sed 's/ */\n/g' | sort -u > $(EXCLUDES_FILE).tmp mv $(EXCLUDES_FILE).tmp $(EXCLUDES_FILE) clean: clean.pkg-exclude-built-today clean.pkg-exclude-built-today: rm -f $(EXCLUDES_FILE).tmp built-today.tmp +pkg-exclude-installed: + $(JW_PKG) info-projects | while read p; do sed -i "s/^# *$$p$$/$$p/" $(EXCLUDES_FILE) ; done + pkg-list-groups: @find . -name project.conf | xargs sed '/^ *group *=/!d; s/group *= *//; s/"//g' | sort -u