From 22b6236e6d49e804ba53fdf4b2aa1fb5056c00f7 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 16 Mar 2018 14:02:06 +0000 Subject: [PATCH] dirs.mk: Fix empty PREREQ variable The contents of this variable got lost somewhere along the way, don't know when. This led to prerequisites not being checked, most notably from topdir.mk, where the build should bail out if attempting a build modules out of order. It's now filled in every directory by running projects.py, which might be somehwat overkill. Signed-off-by: Jan Lindemann --- make/dirs.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/make/dirs.mk b/make/dirs.mk index dbe4c2bc..23842f5b 100644 --- a/make/dirs.mk +++ b/make/dirs.mk @@ -33,8 +33,9 @@ SUBDIR_TARGETS = $(filter $(ALLOWED_SUBDIR_TARGETS),$(MAKECMDGOALS)) endif ifneq ($(DONT_CHECK_PREREQ_DONE),true) -PREREQ_DIRS = $(foreach p, $(PREREQ), $(call proj_dir, $(p))) -PREREQ_DIRS_DONE = $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS))) +PREREQ := $(call proj_query,pkg-requires --no-version --no-subpackages --subsections=jw --delimiter=' ' build $(PROJECT)) +PREREQ_DIRS := $(call proj_query,proj-dir $(PREREQ)) +PREREQ_DIRS_DONE := $(addsuffix /dirs-all.done,$(filter-out $(TOPDIR) /opt/%,$(PREREQ_DIRS))) endif all: dirs-all.done