Patchwork Allow extra options to be passed to ubifs creation tools

login
register
mail settings
Submitter Mark Jackson
Date March 4, 2013, 3:28 p.m.
Message ID <5134BD81.1070406@mimc.co.uk>
Download mbox | patch
Permalink /patch/224745/
State Superseded
Headers show

Comments

Mark Jackson - March 4, 2013, 3:28 p.m.
Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
---
 fs/ubifs/Config.in |   14 ++++++++++++++
 fs/ubifs/ubi.mk    |    2 ++
 fs/ubifs/ubifs.mk  |    4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)
Mark Jackson - April 23, 2013, 8:08 a.m.
On 04/03/13 15:28, Mark Jackson wrote:
> Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
> ---
>  fs/ubifs/Config.in |   14 ++++++++++++++
>  fs/ubifs/ubi.mk    |    2 ++
>  fs/ubifs/ubifs.mk  |    4 +++-
>  3 files changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/ubifs/Config.in b/fs/ubifs/Config.in
> index a5ef5f2..f707737 100644
> --- a/fs/ubifs/Config.in
> +++ b/fs/ubifs/Config.in
> @@ -77,6 +77,13 @@ config BR2_TARGET_ROOTFS_UBIFS_LZMA
>  
>  endchoice
>  
> +config BR2_TARGET_ROOTFS_UBIFS_OPTS
> +	string "Additional mkfs.ubifs options"
> +	default ""
> +	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 +105,10 @@ 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"
> +	default ""
> +	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))
> 

Does anyone have any comments on this ?

Can it be added ?

Cheers
Mark J.
Thomas Petazzoni - April 23, 2013, 2:29 p.m.
Dear Mark Jackson,

It would be good if the commit title was:

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

On Mon, 04 Mar 2013 15:28:01 +0000, Mark Jackson wrote:
> Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
> ---
>  fs/ubifs/Config.in |   14 ++++++++++++++
>  fs/ubifs/ubi.mk    |    2 ++
>  fs/ubifs/ubifs.mk  |    4 +++-
>  3 files changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/ubifs/Config.in b/fs/ubifs/Config.in
> index a5ef5f2..f707737 100644
> --- a/fs/ubifs/Config.in
> +++ b/fs/ubifs/Config.in
> @@ -77,6 +77,13 @@ config BR2_TARGET_ROOTFS_UBIFS_LZMA
>  
>  endchoice
>  
> +config BR2_TARGET_ROOTFS_UBIFS_OPTS
> +	string "Additional mkfs.ubifs options"
> +	default ""

I believe that the default "" is not needed, since this is the default
(empty value).

> +	depends on BR2_TARGET_ROOTFS_UBIFS

If you have some time, you could send a follow-up patch that factorizes
all the "depends on BR2_TARGET_ROOTFS_UBIFS" by enclosing the UBI
options in a "if BR2_TARGET_ROOTFS_UBIFS .. endif" block. But if you do
it, do it as a separate patch.

> +	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 +105,10 @@ 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"
> +	default ""

Ditto for default.

> +	depends on BR2_TARGET_ROOTFS_UBI

... and for the separate patch to factor out the depends on here.

Once the minor details above (title and removal of default "") are
fixed, you can resend a v2 with my:

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Best regards,

Thomas

Patch

diff --git a/fs/ubifs/Config.in b/fs/ubifs/Config.in
index a5ef5f2..f707737 100644
--- a/fs/ubifs/Config.in
+++ b/fs/ubifs/Config.in
@@ -77,6 +77,13 @@  config BR2_TARGET_ROOTFS_UBIFS_LZMA
 
 endchoice
 
+config BR2_TARGET_ROOTFS_UBIFS_OPTS
+	string "Additional mkfs.ubifs options"
+	default ""
+	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 +105,10 @@  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"
+	default ""
+	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))