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

LEDE Commits lede-commits at lists.infradead.org
Fri Jul 22 04:59:06 PDT 2016


nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=11fc0cd1b1f80a9452863612f63f42863f02429b

commit 11fc0cd1b1f80a9452863612f63f42863f02429b
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Fri Jul 22 13:26:37 2016 +0200

    image.mk: create default ubifs before calling legacy image build code
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 include/image.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/image.mk b/include/image.mk
index 47cb1a5..ccd07a4 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))
 	)



More information about the lede-commits mailing list