From: John Crispin <john@openwrt.org>
Date: Thu, 3 Apr 2014 14:26:31 +0000 (+0000)
Subject: include/make.mk: add support for ubinize-overlay.cfg
X-Git-Tag: reboot~7552
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=08f03e959b4d03f47dbccf14b1f9b03df3101ab0;p=openwrt%2Fstaging%2Fxback.git

include/make.mk: add support for ubinize-overlay.cfg

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 40365
---

diff --git a/include/image.mk b/include/image.mk
index bc7e7dbd1b..978858a32f 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -130,6 +130,19 @@ ifneq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),)
 endif
 
 ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
+    define Image/mkfs/ubifs/generate
+	$(CP) ./ubinize$(1).cfg $(KDIR)
+	( cd $(KDIR); \
+		$(STAGING_DIR_HOST)/bin/ubinize \
+		$(if $($(PROFILE)_UBI_OPTS), \
+			$(shell echo $($(PROFILE)_UBI_OPTS)), \
+			$(shell echo $(UBI_OPTS)) \
+		) \
+		-o $(KDIR)/root$(1).ubi \
+		ubinize$(1).cfg \
+	)
+    endef
+
     define Image/mkfs/ubifs
 
         ifneq ($($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS),)
@@ -150,16 +163,8 @@ ifneq ($(CONFIG_TARGET_ROOTFS_UBIFS),)
 	$(call Image/Build,ubifs)
 
         ifneq ($($(PROFILE)_UBI_OPTS)$(UBI_OPTS),)
-		$(CP) ./ubinize.cfg $(KDIR)
-		( cd $(KDIR); \
-		$(STAGING_DIR_HOST)/bin/ubinize \
-			$(if $($(PROFILE)_UBI_OPTS), \
-				$(shell echo $($(PROFILE)_UBI_OPTS)), \
-				$(shell echo $(UBI_OPTS)) \
-			) \
-			-o $(KDIR)/root.ubi \
-			ubinize.cfg \
-		)
+		$(call Image/mkfs/ubifs/generate,)
+		$(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay))
         endif
 	$(call Image/Build,ubi)
     endef