[Buildroot] [PATCH v2] fs: squashfs: Add config option to pass nopad parameter to mksquashfs

[Buildroot] [PATCH v2] fs: squashfs: Add config option to pass nopad parameter to mksquashfs

[Heiko Stuebner]

From: Christoph Muellner <christoph.muellner@theobroma-systems.com>

Add an option to enable/disable padding to a multiple of 4k. Padding is
the default as it also was the past default behaviour.

Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
---
This superseedes the generic approach of adding a generic commandline param
https://patchwork.ozlabs.org/project/buildroot/patch/20200612133249.4127906-1-heiko at sntech.de/

 fs/squashfs/Config.in   | 8 ++++++++
 fs/squashfs/squashfs.mk | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in
index dde2097cb7..70d4a20cf0 100644
--- a/fs/squashfs/Config.in
+++ b/fs/squashfs/Config.in
@@ -5,6 +5,13 @@ config BR2_TARGET_ROOTFS_SQUASHFS
 
 if BR2_TARGET_ROOTFS_SQUASHFS
 
+config BR2_TARGET_ROOTFS_SQUASHFS_PAD
+	bool "pad to a 4K boundary"
+	default y # legacy was always ON
+	help
+	  Say 'y' here (the default) to pad the the filesystem image
+	  to a 4K boundary. Say 'n' to disable padding.
+
 choice
 	prompt "Compression algorithm"
 	default BR2_TARGET_ROOTFS_SQUASHFS4_GZIP
@@ -31,4 +38,5 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD
 	bool "zstd"
 
 endchoice
+
 endif
diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index 34ab048603..7a5e3e313e 100644
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -8,6 +8,10 @@ ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs
 
 ROOTFS_SQUASHFS_ARGS = -noappend -processors $(PARALLEL_JOBS)
 
+ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_PAD),)
+ROOTFS_SQUASHFS_ARGS += -nopad
+endif
+
 ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y)
 ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc
 else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
-- 
2.26.2

[Buildroot] [PATCH v2] fs: squashfs: Add config option to pass nopad parameter to mksquashfs

[Yann E. MORIN]

Heiko, All,

On 2020-06-15 00:41 +0200, Heiko Stuebner spake thusly:
> From: Christoph Muellner <christoph.muellner@theobroma-systems.com>
> 
> Add an option to enable/disable padding to a multiple of 4k. Padding is
> the default as it also was the past default behaviour.
> 
> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
> Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
> This superseedes the generic approach of adding a generic commandline param
> https://patchwork.ozlabs.org/project/buildroot/patch/20200612133249.4127906-1-heiko at sntech.de/
> 
>  fs/squashfs/Config.in   | 8 ++++++++
>  fs/squashfs/squashfs.mk | 4 ++++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in
> index dde2097cb7..70d4a20cf0 100644
> --- a/fs/squashfs/Config.in
> +++ b/fs/squashfs/Config.in
> @@ -5,6 +5,13 @@ config BR2_TARGET_ROOTFS_SQUASHFS
>  
>  if BR2_TARGET_ROOTFS_SQUASHFS
>  
> +config BR2_TARGET_ROOTFS_SQUASHFS_PAD
> +	bool "pad to a 4K boundary"
> +	default y # legacy was always ON
> +	help
> +	  Say 'y' here (the default) to pad the the filesystem image
> +	  to a 4K boundary. Say 'n' to disable padding.
> +
>  choice
>  	prompt "Compression algorithm"
>  	default BR2_TARGET_ROOTFS_SQUASHFS4_GZIP
> @@ -31,4 +38,5 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD
>  	bool "zstd"
>  
>  endchoice
> +
>  endif
> diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
> index 34ab048603..7a5e3e313e 100644
> --- a/fs/squashfs/squashfs.mk
> +++ b/fs/squashfs/squashfs.mk
> @@ -8,6 +8,10 @@ ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs
>  
>  ROOTFS_SQUASHFS_ARGS = -noappend -processors $(PARALLEL_JOBS)
>  
> +ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_PAD),)
> +ROOTFS_SQUASHFS_ARGS += -nopad
> +endif
> +
>  ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y)
>  ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc
>  else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
> -- 
> 2.26.2
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'