From 5916dca0c51ed586cc5ca8d3e9731f04408832d6 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 3 Apr 2026 18:41:57 +0200 Subject: [PATCH] projects-dir.mk: Add variable DEP_PROJECTS make git-show-pushable-master-branches misses projects which should better be pulled in as dependencies. It searches $(BUILLD_PROJECTS) for repositories with pushable commits, that variable leaves some out, and DEP_PROJECTS has them. It make use of the renovated pkg-requires command. This move should be extended to other uses of BUILD_PROJECTS as well, after giving it some test runs. And the legacy and redundant command prereq should be removed. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 19d8ff76..6c6c883c 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -145,6 +145,7 @@ JANWARE_PACKAGE_FILTER = url =~ janware TARGET_PROJECTS = $(filter-out $(EXCLUDE_FROM_BUILD),$(PROJECTS)) BUILD_PROJECTS = $(shell $(JW_PKG_PY_BUILD) --build-order all $(TARGET_PROJECTS)) +DEP_PROJECTS = $(shell $(JW_PKG_PY_PROJECTS) pkg-requires --syntax names-only --no-subpackages --delimiter ' ' --subsections jw run,build,devel,release $(TARGET_PROJECTS)) GIT_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /.git,$(BUILD_PROJECTS))))) PROJECTS_WITH_PROJECT_CONF = $(patsubst %/make/project.conf,%,$(wildcard $(addsuffix /make/project.conf,$(BUILD_PROJECTS)))) @@ -359,7 +360,7 @@ git-show-non-master-branches: done git-show-pushable-master-branches: - $(Q)for p in $(BUILD_PROJECTS); do \ + $(Q)for p in $(DEP_PROJECTS); do \ if git -C $$p log --oneline origin/master.. | grep . >/dev/null; then \ echo ======================= $$p ;\ git -C $$p log --oneline origin/master.. ;\