From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 22 Jul 2016 11:26:37 +0000 (+0200)
Subject: image.mk: create default ubifs before calling legacy image build code
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=11fc0cd1b1f80a9452863612f63f42863f02429b;p=openwrt%2Fstaging%2Fblocktrron.git

image.mk: create default ubifs before calling legacy image build code

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/include/image.mk b/include/image.mk
index 47cb1a58a9..ccd07a43df 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -485,7 +485,7 @@ define BuildImage
   $(foreach device,$(TARGET_DEVICES),$(call Device,$(device)))
   $(foreach device,$(LEGACY_DEVICES),$(call LegacyDevice,$(device)))
 
-  install-images: kernel_prepare $(foreach fs,$(filter-out ubifs,$(TARGET_FILESYSTEMS) $(fs-subtypes-y)),$(KDIR)/root.$(fs))
+  install-images: kernel_prepare $(foreach fs,$(filter-out $(if $(UBIFS_OPTS),,ubifs),$(TARGET_FILESYSTEMS) $(fs-subtypes-y)),$(KDIR)/root.$(fs))
 	$(foreach fs,$(TARGET_FILESYSTEMS),
 		$(call Image/Build,$(fs))
 	)