From: Thomas Petazzoni Date: Sun, 26 Apr 2015 09:50:59 +0000 (+0200) Subject: fs: only add non rootfs- targets to PACKAGES X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54640e8e89c2b47c0bd5c18a37bc98fffced99ca;p=buildroot.git fs: only add non rootfs- targets to PACKAGES Commit 4570dbcb14b394d8f3c97baf4c9e5f4f225d1d37 ("4570dbcb14b394d8f3c97baf4c9e5f4f225d1d37") added the dependencies of rootfs building logic to PACKAGES, only thinking about the case where rootfs building logic actually depends on real, normal packages (host-mtd, host-genext2fs, etc.). But some file systems (rootfs-ubi) depend on other filesystem images (rootfs-ubifs). And such targets should not be added to PACKAGES, otherwise an incorrect circular dependency is created. This commit fixes that by only adding the rootfs building logic dependencies that do *not* start with rootfs- to the global PACKAGES variable. Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- diff --git a/fs/common.mk b/fs/common.mk index 41ee86daca..4387d069a1 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -106,7 +106,7 @@ rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS) ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y) TARGETS_ROOTFS += rootfs-$(1) -PACKAGES += $$(ROOTFS_$(2)_DEPENDENCIES) +PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_DEPENDENCIES)) endif endef