From 2d0544743a6dcea2db42649aac813b81470a5813 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 18 Oct 2026 17:10:14 +0200 Subject: [PATCH] topdir.mk: Remove --skip-excluded from install targets Using --skip-excluded in pkg-install-*'s recipes breaks CI, and here's how: During a CI run, a package is expected to be testable with only jw-pkg and the package itself installed in the test environment. "testable" here means that it's possible to install the necessary dependencies with make pkg-install-* commands before building. That condition is inherently always met by packages which have only jw-pkg as its only dependency. But it's not true for packages with intermediate packages in their dependency tree. For for those packages it's not advisable to pass --skip-excluded to the dependency detection, because that will cause the resolver to try and find the intermediate's project.conf to read its [build].excluded section. Which fails because that intermediate is neither installed nor checked out. So, until there's another mechansim in place which allows excluding uninstalled packages (caller-supplied knowledge, reading remote repositories, package-manager-like package metadata cache), drop --skip-excluded from the pkg-install-* targets' recipes. Signed-off-by: Jan Lindemann --- make/topdir.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/topdir.mk b/make/topdir.mk index e83c60e3..3d51c7fa 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -297,13 +297,13 @@ pkg-manager-refresh: $(PKG_MANAGER) refresh pkg-install-build-deps: - $(PKG_MANAGER) install $(shell $(proj_query_cmd) required-os-pkg --quote --skip-excluded "build" $(PROJECT)) + $(PKG_MANAGER) install $(shell $(proj_query_cmd) required-os-pkg --quote "build" $(PROJECT)) pkg-install-release-deps: - $(PKG_MANAGER) install $(shell $(proj_query_cmd) required-os-pkg --quote --skip-excluded "build,run,release" $(PROJECT)) + $(PKG_MANAGER) install $(shell $(proj_query_cmd) required-os-pkg --quote "build,run,release" $(PROJECT)) pkg-install-testbuild-deps: - $(PKG_MANAGER) install $(shell $(proj_query_cmd) pkg-requires --quote --skip-excluded --hide-self --syntax names-only --delimiter " " "build,run,devel,release" $(PROJECT)) + $(PKG_MANAGER) install $(shell $(proj_query_cmd) pkg-requires --quote --hide-self --syntax names-only --delimiter " " "build,run,devel,release" $(PROJECT)) recache-vars: rm -f $(TOPDIR)/make clean-cache cache -- 2.56.0