projects-dir.mk: Use --skip-excluded

Add --skip-excluded to targets installing or querying dependencies.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-03-07 17:29:15 +00:00
commit 620bc022f3

View file

@ -122,7 +122,7 @@ install:
@exit 1
build-order: $(filter-out $(UNAVAILABLE_TARGETS),pull.done)
$(BUILD_PY) order $(BUILD_PROJECTS) | sed 's/ */\n/g'
$(BUILD_PY) order $(BUILD_PROJECTS) $(BUILD_PY_EXTRA_ARGS) | sed 's/ */\n/g'
clean-dirs:
if [ -n "$(wildcard */*.done)" ]; then ls */*.done 2>/dev/null | sed 's%/.*%%' | xargs -r $(BUILD_PY) --exclude "" clean; fi
@ -131,10 +131,10 @@ clean-all-dirs:
$(BUILD_PY) clean $(PROJECTS)
echo-prereq-build:
@$(PROJECTS_PY) requires-pkg --flavours "build" $(BUILD_PROJECTS)
@$(PROJECTS_PY) requires-pkg --skip-excluded --flavours "build" $(BUILD_PROJECTS)
echo-prereq-release:
@$(PROJECTS_PY) requires-pkg --flavours "build run release" $(BUILD_PROJECTS)
@$(PROJECTS_PY) requires-pkg --skip-excluded --flavours "build run release" $(BUILD_PROJECTS)
echo-os:
@$(GET_OS_SH)
@ -146,10 +146,10 @@ pkg-manager-refresh:
$(PKG_MANAGER_SH) refresh -y
pkg-install-prereq-build:
$(PKG_MANAGER_SH) install -y $(BASE_PACKAGES) $(shell $(PROJECTS_PY) requires-pkg --flavours "build" $(BUILD_PROJECTS))
$(PKG_MANAGER_SH) install -y $(BASE_PACKAGES) $(shell $(PROJECTS_PY) requires-pkg --skip-excluded --flavours "build" $(BUILD_PROJECTS))
pkg-install-prereq-release:
$(PKG_MANAGER_SH) install -y $(BASE_PACKAGES) $(shell $(PROJECTS_PY) requires-pkg --flavours "build run release" $(BUILD_PROJECTS))
$(PKG_MANAGER_SH) install -y $(BASE_PACKAGES) $(shell $(PROJECTS_PY) requires-pkg --skip-excluded --flavours "build run release" $(BUILD_PROJECTS))
pkg-exclude-built-today:
touch $(EXCLUDES_FILE)