build-distro: skip pseudo subprofiles

rootfs presented a special case when there is no resulting directory at all as it gets merged with the target subprofile by design. Still those features adding only rootfs scripts need to depend on it but this resulted in an attempt to process a missing subdir. This is brought back to sanity now.

build-distro: skip pseudo subprofiles
da65dc2f · Michael Shigorin · 33e154dd · da65dc2f
Commit da65dc2f authored Jul 15, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

90-build-distro.mk features.in/build-distro/lib/90-build-distro.mk +3 -2

No files found.
--- a/features.in/build-distro/lib/90-build-distro.mk
+++ b/features.in/build-distro/lib/90-build-distro.mk
 # step 4: build the distribution image

-# take the latter part for complex-specified subprofiles like stage2@live
-SUBDIRS = $(SUBPROFILE_DIRS)
+# take the latter part for complex-specified subprofiles like stage2@live;
+# care to exclude non-directories holding no makefiles like rootfs
+SUBDIRS = $(sort $(dir $(wildcard $(addsuffix /Makefile,$(SUBPROFILE_DIRS)))))

 # proxy over the ISO metadata collected; see also genisoimagerc(5)
 BOOT_SYSI := $(META_SYSTEM_ID)