From 4added669214e2b5e38d3c0cd580f870942e1cd9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 19 Jul 2016 12:35:27 +0200 Subject: build: split legacy image mkfs.ubifs command from the one used for the new image building code Signed-off-by: Felix Fietkau --- include/image-legacy.mk | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'include/image-legacy.mk') diff --git a/include/image-legacy.mk b/include/image-legacy.mk index 3acf2b9760..1b8a9115fc 100644 --- a/include/image-legacy.mk +++ b/include/image-legacy.mk @@ -1,3 +1,44 @@ +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/legacy + + $(if $($(PROFILE)_UBIFS_OPTS)$(UBIFS_OPTS), + $(STAGING_DIR_HOST)/bin/mkfs.ubifs \ + $(if $($(PROFILE)_UBIFS_OPTS), \ + $(shell echo $($(PROFILE)_UBIFS_OPTS)), \ + $(shell echo $(UBIFS_OPTS)) \ + ) \ + $(if $(CONFIG_TARGET_UBIFS_FREE_SPACE_FIXUP),--space-fixup) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_NONE),--force-compr=none) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_LZO),--force-compr=lzo) \ + $(if $(CONFIG_TARGET_UBIFS_COMPRESSION_ZLIB),--force-compr=zlib) \ + $(if $(shell echo $(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)),--jrn-size=$(CONFIG_TARGET_UBIFS_JOURNAL_SIZE)) \ + --squash-uids \ + -o $(KDIR)/root.ubifs \ + -d $(TARGET_DIR) + ) + $(call Image/Build,ubifs) + + $(if $($(PROFILE)_UBI_OPTS)$(UBI_OPTS), + $(if $(wildcard ./ubinize.cfg),$(call Image/mkfs/ubifs/generate,)) + $(if $(wildcard ./ubinize-overlay.cfg),$(call Image/mkfs/ubifs/generate,-overlay)) + ) + $(if $(wildcard ./ubinize.cfg),$(call Image/Build,ubi)) + endef +endif + LegacyDevice/Dump = $(Device/Dump) define LegacyDevice/Check -- cgit v1.2.3