aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-04-03 14:26:31 +0000
committerJohn Crispin <john@openwrt.org>2014-04-03 14:26:31 +0000
commit08f03e959b4d03f47dbccf14b1f9b03df3101ab0 (patch)
treec25b4f89588fc8f59a1a8f70495dd9338af49dda /include
parent58eccdac4fb6b384dde8723876e69dafb8bf2368 (diff)
downloadupstream-08f03e959b4d03f47dbccf14b1f9b03df3101ab0.tar.gz
upstream-08f03e959b4d03f47dbccf14b1f9b03df3101ab0.tar.bz2
upstream-08f03e959b4d03f47dbccf14b1f9b03df3101ab0.zip
include/make.mk: add support for ubinize-overlay.cfg
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 40365
Diffstat (limited to 'include')
-rw-r--r--include/image.mk25
1 files changed, 15 insertions, 10 deletions
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