diff mbox

[v2] fs/ubifs: allow extra options to be passed to ubifs creation tools

Message ID 5176A6AD.8090907@newflow.co.uk
State Accepted
Commit a0f3cb1cbeba376a8a8105b58f7f85e63baa11fe
Headers show

Commit Message

Mark Jackson April 23, 2013, 3:20 p.m. UTC
Allow extra options to be passed to ubifs creation tools.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Changes in v2:
- Minor changes as suggested by Thomas Petazzoni

 fs/ubifs/Config.in |   12 ++++++++++++
 fs/ubifs/ubi.mk    |    2 ++
 fs/ubifs/ubifs.mk  |    4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni April 23, 2013, 3:42 p.m. UTC | #1
Dear Mark Jackson,

On Tue, 23 Apr 2013 16:20:13 +0100, Mark Jackson wrote:
> Allow extra options to be passed to ubifs creation tools.
> 
> Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Thanks, but your patch should be sent inline and not as an attached
file. To be sure that your mail client doesn't mess up with the patch,
I'd recommend using git send-email.

Best regards,

Thomas
diff mbox

Patch

diff --git a/fs/ubifs/Config.in b/fs/ubifs/Config.in
index a5ef5f2..f17c7dc 100644
--- a/fs/ubifs/Config.in
+++ b/fs/ubifs/Config.in
@@ -77,6 +77,12 @@  config BR2_TARGET_ROOTFS_UBIFS_LZMA
 
 endchoice
 
+config BR2_TARGET_ROOTFS_UBIFS_OPTS
+	string "Additional mkfs.ubifs options"
+	depends on BR2_TARGET_ROOTFS_UBIFS
+	help
+	  Any additional mkfs.ubifs options you may want to include.
+
 config BR2_TARGET_ROOTFS_UBI
 	depends on BR2_TARGET_ROOTFS_UBIFS
 	bool "Embed into an UBI image"
@@ -98,3 +104,9 @@  config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 	help
 	  Tells ubinize that the flash supports sub-pages and the sub-page
 	  size. Use 0 if subpages are not supported on flash chip.
+
+config BR2_TARGET_ROOTFS_UBI_OPTS
+	string "Additional ubinize options"
+	depends on BR2_TARGET_ROOTFS_UBI
+	help
+	  Any additional ubinize options you may want to include.
diff --git a/fs/ubifs/ubi.mk b/fs/ubifs/ubi.mk
index 51ab42d..e9033e8 100644
--- a/fs/ubifs/ubi.mk
+++ b/fs/ubifs/ubi.mk
@@ -10,6 +10,8 @@  ifneq ($(BR2_TARGET_ROOTFS_UBI_SUBSIZE),0)
 UBI_UBINIZE_OPTS += -s $(BR2_TARGET_ROOTFS_UBI_SUBSIZE)
 endif
 
+UBI_UBINIZE_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_OPTS))
+
 ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs
 
 define ROOTFS_UBI_CMD
diff --git a/fs/ubifs/ubifs.mk b/fs/ubifs/ubifs.mk
index 8506dbd..dca2e04 100644
--- a/fs/ubifs/ubifs.mk
+++ b/fs/ubifs/ubifs.mk
@@ -16,10 +16,12 @@  ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_NONE),y)
 UBIFS_OPTS += -x none
 endif
 
+UBIFS_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBIFS_OPTS))
+
 ROOTFS_UBIFS_DEPENDENCIES = host-mtd
 
 define ROOTFS_UBIFS_CMD
 	$(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
 endef
 
-$(eval $(call ROOTFS_TARGET,ubifs))
\ No newline at end of file
+$(eval $(call ROOTFS_TARGET,ubifs))