* [ptxdist] [PATCH v2 2/5] image-root-squashfs: add zstd compression option
2020-07-20 14:50 [ptxdist] [PATCH v2 1/5] host-zstd: new package Bruno Thomsen
@ 2020-07-20 14:50 ` Bruno Thomsen
2020-07-20 14:50 ` [ptxdist] [PATCH v2 3/5] host-squashfs-tools: add support for zstd contitional Bruno Thomsen
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Bruno Thomsen @ 2020-07-20 14:50 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, bth
Set block size and compression level parameters for optimal
result by default.
BLOCK_SIZE="1M"
EXTRA_ARGS="-Xcompression-level 22"
It's still very fast on an ordinary laptop.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
No changes since version 1.
platforms/image-root-squashfs.in | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/platforms/image-root-squashfs.in b/platforms/image-root-squashfs.in
index 5f9368770..f3645682e 100644
--- a/platforms/image-root-squashfs.in
+++ b/platforms/image-root-squashfs.in
@@ -45,6 +45,11 @@ choice
help
Select your preferred compression mode.
+ config IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
+ bool "zstd"
+ help
+ Select your preferred compression mode.
+
endchoice
config IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE
@@ -54,10 +59,12 @@ config IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE
default "lzo" if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO
default "lz4" if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZ4
default "xz" if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ
+ default "zstd" if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
config IMAGE_ROOT_SQUASHFS_BLOCK_SIZE
string
- default "128k"
+ default "128k" if !IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
+ default "1M" if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
prompt "Block size"
help
This allows the compression data block size to be selected, both "K" and "M"
@@ -65,6 +72,8 @@ config IMAGE_ROOT_SQUASHFS_BLOCK_SIZE
config IMAGE_ROOT_SQUASHFS_EXTRA_ARGS
string
+ default "" if !IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
+ default "-Xcompression-level 22" if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
prompt "extra arguments passed to mksquashfs"
help
You can add extra arguments for mksquashfs here
--
2.26.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH v2 3/5] host-squashfs-tools: add support for zstd contitional
2020-07-20 14:50 [ptxdist] [PATCH v2 1/5] host-zstd: new package Bruno Thomsen
2020-07-20 14:50 ` [ptxdist] [PATCH v2 2/5] image-root-squashfs: add zstd compression option Bruno Thomsen
@ 2020-07-20 14:50 ` Bruno Thomsen
2020-07-24 7:54 ` Michael Olbrich
2020-07-20 14:50 ` [ptxdist] [PATCH v2 4/5] host-squashfs-tools: conditional select lzo and xz dependencies Bruno Thomsen
2020-07-20 14:50 ` [ptxdist] [PATCH v2 5/5] host-squashfs-tools: fix lz4 compression option Bruno Thomsen
3 siblings, 1 reply; 7+ messages in thread
From: Bruno Thomsen @ 2020-07-20 14:50 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, bth
Only enable host zstd package dependency when needed,
so it doesn't build unnecessary packages.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
Changes since version 1:
Removed all /usr/local paths changes in HOST_SQUASHFS_TOOLS_MAKE_ENV.
This looks cleaner :)
rules/host-squashfs-tools.in | 1 +
rules/host-squashfs-tools.make | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
index 4ac2fa1b0..5ea45120e 100644
--- a/rules/host-squashfs-tools.in
+++ b/rules/host-squashfs-tools.in
@@ -5,4 +5,5 @@ config HOST_SQUASHFS_TOOLS
select HOST_ZLIB
select HOST_LIBLZO
select HOST_XZ
+ select HOST_ZSTD if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
default y if ALLYES
diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
index 39a6d11e1..1f3f54390 100644
--- a/rules/host-squashfs-tools.make
+++ b/rules/host-squashfs-tools.make
@@ -21,7 +21,11 @@ HOST_SQUASHFS_TOOLS_SUBDIR := squashfs-tools
# Compile
# ----------------------------------------------------------------------------
-HOST_SQUASHFS_TOOLS_MAKE_OPT := LZO_SUPPORT=1 XZ_SUPPORT=1
+HOST_SQUASHFS_TOOLS_MAKE_OPT := \
+ LZO_SUPPORT=1 \
+ XZ_SUPPORT=1 \
+ ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD,1,0)
+
HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"
HOST_SQUASHFS_TOOLS_MAKE_PAR := NO
HOST_SQUASHFS_TOOLS_INSTALL_OPT = install INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/sbin"
--
2.26.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH v2 3/5] host-squashfs-tools: add support for zstd contitional
2020-07-20 14:50 ` [ptxdist] [PATCH v2 3/5] host-squashfs-tools: add support for zstd contitional Bruno Thomsen
@ 2020-07-24 7:54 ` Michael Olbrich
0 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2020-07-24 7:54 UTC (permalink / raw)
To: ptxdist
On Mon, Jul 20, 2020 at 04:50:30PM +0200, Bruno Thomsen wrote:
> Only enable host zstd package dependency when needed,
> so it doesn't build unnecessary packages.
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
> Changes since version 1:
> Removed all /usr/local paths changes in HOST_SQUASHFS_TOOLS_MAKE_ENV.
> This looks cleaner :)
>
> rules/host-squashfs-tools.in | 1 +
> rules/host-squashfs-tools.make | 6 +++++-
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
> index 4ac2fa1b0..5ea45120e 100644
> --- a/rules/host-squashfs-tools.in
> +++ b/rules/host-squashfs-tools.in
> @@ -5,4 +5,5 @@ config HOST_SQUASHFS_TOOLS
> select HOST_ZLIB
> select HOST_LIBLZO
> select HOST_XZ
> + select HOST_ZSTD if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
> default y if ALLYES
> diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
> index 39a6d11e1..1f3f54390 100644
> --- a/rules/host-squashfs-tools.make
> +++ b/rules/host-squashfs-tools.make
> @@ -21,7 +21,11 @@ HOST_SQUASHFS_TOOLS_SUBDIR := squashfs-tools
> # Compile
> # ----------------------------------------------------------------------------
>
> -HOST_SQUASHFS_TOOLS_MAKE_OPT := LZO_SUPPORT=1 XZ_SUPPORT=1
> +HOST_SQUASHFS_TOOLS_MAKE_OPT := \
> + LZO_SUPPORT=1 \
> + XZ_SUPPORT=1 \
> + ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD,1,0)
Oh, I missed this the last time, sorry. You cannot use kconfig symbols from
other packages in a rule file. Otherwise dirty tracking is broken.
So we need a PTXCONF_HOST_SQUASHFS_ZSTD option for this and select it in
the image.
Michael
> +
> HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"
> HOST_SQUASHFS_TOOLS_MAKE_PAR := NO
> HOST_SQUASHFS_TOOLS_INSTALL_OPT = install INSTALL_DIR="$(HOST_SQUASHFS_TOOLS_PKGDIR)/sbin"
> --
> 2.26.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH v2 4/5] host-squashfs-tools: conditional select lzo and xz dependencies
2020-07-20 14:50 [ptxdist] [PATCH v2 1/5] host-zstd: new package Bruno Thomsen
2020-07-20 14:50 ` [ptxdist] [PATCH v2 2/5] image-root-squashfs: add zstd compression option Bruno Thomsen
2020-07-20 14:50 ` [ptxdist] [PATCH v2 3/5] host-squashfs-tools: add support for zstd contitional Bruno Thomsen
@ 2020-07-20 14:50 ` Bruno Thomsen
2020-07-24 7:54 ` Michael Olbrich
2020-07-20 14:50 ` [ptxdist] [PATCH v2 5/5] host-squashfs-tools: fix lz4 compression option Bruno Thomsen
3 siblings, 1 reply; 7+ messages in thread
From: Bruno Thomsen @ 2020-07-20 14:50 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, bth
Only select host lzo and host xz packages when needed to
speed up complete build time and avoid unnecessary dependencies.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
No changes since version 1.
rules/host-squashfs-tools.in | 4 ++--
rules/host-squashfs-tools.make | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
index 5ea45120e..9e50784dd 100644
--- a/rules/host-squashfs-tools.in
+++ b/rules/host-squashfs-tools.in
@@ -3,7 +3,7 @@
config HOST_SQUASHFS_TOOLS
tristate
select HOST_ZLIB
- select HOST_LIBLZO
- select HOST_XZ
+ select HOST_LIBLZO if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO
+ select HOST_XZ if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ
select HOST_ZSTD if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
default y if ALLYES
diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
index 1f3f54390..42d24ad89 100644
--- a/rules/host-squashfs-tools.make
+++ b/rules/host-squashfs-tools.make
@@ -22,8 +22,8 @@ HOST_SQUASHFS_TOOLS_SUBDIR := squashfs-tools
# ----------------------------------------------------------------------------
HOST_SQUASHFS_TOOLS_MAKE_OPT := \
- LZO_SUPPORT=1 \
- XZ_SUPPORT=1 \
+ LZO_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO,1,0) \
+ XZ_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ,1,0) \
ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD,1,0)
HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"
--
2.26.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [ptxdist] [PATCH v2 4/5] host-squashfs-tools: conditional select lzo and xz dependencies
2020-07-20 14:50 ` [ptxdist] [PATCH v2 4/5] host-squashfs-tools: conditional select lzo and xz dependencies Bruno Thomsen
@ 2020-07-24 7:54 ` Michael Olbrich
0 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2020-07-24 7:54 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, bth
On Mon, Jul 20, 2020 at 04:50:31PM +0200, Bruno Thomsen wrote:
> Only select host lzo and host xz packages when needed to
> speed up complete build time and avoid unnecessary dependencies.
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
> No changes since version 1.
>
> rules/host-squashfs-tools.in | 4 ++--
> rules/host-squashfs-tools.make | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
> index 5ea45120e..9e50784dd 100644
> --- a/rules/host-squashfs-tools.in
> +++ b/rules/host-squashfs-tools.in
> @@ -3,7 +3,7 @@
> config HOST_SQUASHFS_TOOLS
> tristate
> select HOST_ZLIB
> - select HOST_LIBLZO
> - select HOST_XZ
> + select HOST_LIBLZO if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO
> + select HOST_XZ if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ
> select HOST_ZSTD if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
> default y if ALLYES
> diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
> index 1f3f54390..42d24ad89 100644
> --- a/rules/host-squashfs-tools.make
> +++ b/rules/host-squashfs-tools.make
> @@ -22,8 +22,8 @@ HOST_SQUASHFS_TOOLS_SUBDIR := squashfs-tools
> # ----------------------------------------------------------------------------
>
> HOST_SQUASHFS_TOOLS_MAKE_OPT := \
> - LZO_SUPPORT=1 \
> - XZ_SUPPORT=1 \
> + LZO_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO,1,0) \
> + XZ_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ,1,0) \
Same thing as with zstd.
Michael
> ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD,1,0)
>
> HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"
> --
> 2.26.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread
* [ptxdist] [PATCH v2 5/5] host-squashfs-tools: fix lz4 compression option
2020-07-20 14:50 [ptxdist] [PATCH v2 1/5] host-zstd: new package Bruno Thomsen
` (2 preceding siblings ...)
2020-07-20 14:50 ` [ptxdist] [PATCH v2 4/5] host-squashfs-tools: conditional select lzo and xz dependencies Bruno Thomsen
@ 2020-07-20 14:50 ` Bruno Thomsen
3 siblings, 0 replies; 7+ messages in thread
From: Bruno Thomsen @ 2020-07-20 14:50 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, bth
Conditional select host-lz4 package if lz4 compressions is
used by image-root-squashfs and enable support in package.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
No changes since version 1.
rules/host-squashfs-tools.in | 1 +
rules/host-squashfs-tools.make | 1 +
2 files changed, 2 insertions(+)
diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in
index 9e50784dd..f8e44ef1d 100644
--- a/rules/host-squashfs-tools.in
+++ b/rules/host-squashfs-tools.in
@@ -4,6 +4,7 @@ config HOST_SQUASHFS_TOOLS
tristate
select HOST_ZLIB
select HOST_LIBLZO if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO
+ select HOST_LZ4 if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZ4
select HOST_XZ if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ
select HOST_ZSTD if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD
default y if ALLYES
diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make
index 42d24ad89..f71687e05 100644
--- a/rules/host-squashfs-tools.make
+++ b/rules/host-squashfs-tools.make
@@ -23,6 +23,7 @@ HOST_SQUASHFS_TOOLS_SUBDIR := squashfs-tools
HOST_SQUASHFS_TOOLS_MAKE_OPT := \
LZO_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO,1,0) \
+ LZ4_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZ4,1,0) \
XZ_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ,1,0) \
ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD,1,0)
--
2.26.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 7+ messages in thread