[ptxdist] [PATCH 1/5] host-zstd: new package

[ptxdist] [PATCH 1/5] host-zstd: new package

[Bruno Thomsen]

This package can be used by squashfs-tools.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/host-zstd.in   |  6 ++++++
 rules/host-zstd.make | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 rules/host-zstd.in
 create mode 100644 rules/host-zstd.make

diff --git a/rules/host-zstd.in b/rules/host-zstd.in
new file mode 100644
index 000000000..18d291672
--- /dev/null
+++ b/rules/host-zstd.in
@@ -0,0 +1,6 @@
+## SECTION=hosttools_noprompt
+
+config HOST_ZSTD
+	tristate
+	select HOST_CMAKE
+	default y if ALLYES
diff --git a/rules/host-zstd.make b/rules/host-zstd.make
new file mode 100644
index 000000000..e6096d0de
--- /dev/null
+++ b/rules/host-zstd.make
@@ -0,0 +1,42 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Bruno Thomsen <bruno.thomsen@gmail.com>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_HOST_ZSTD) += host-zstd
+
+#
+# Paths and names
+#
+HOST_ZSTD_DIR		:= $(HOST_BUILDDIR)/$(ZSTD)
+HOST_ZSTD_SUBDIR	:= build/cmake
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_ZSTD_CONF_TOOL	:= cmake
+HOST_ZSTD_BUILD_DIR	:= $(HOST_ZSTD_DIR)-build
+HOST_ZSTD_CONF_OPT	:= \
+	$(HOST_CMAKE_USR) \
+	-B$(HOST_ZSTD_BUILD_DIR) \
+	-DZSTD_LEGACY_SUPPORT=OFF \
+	-DZSTD_MULTITHREAD_SUPPORT=ON \
+	-DZSTD_BUILD_PROGRAMS=ON \
+	-DZSTD_BUILD_CONTRIB=OFF \
+	-DZSTD_BUILD_TESTS=OFF \
+	-DZSTD_USE_STATIC_RUNTIME=OFF \
+	-DZSTD_PROGRAMS_LINK_SHARED=ON \
+	-DZSTD_BUILD_STATIC=OFF \
+	-DZSTD_BUILD_SHARED=ON \
+	-DZSTD_ZLIB_SUPPORT=OFF \
+	-DZSTD_LZMA_SUPPORT=OFF \
+	-DZSTD_LZ4_SUPPORT=OFF
+
+# vim: syntax=make

base-commit: 9fe5462616de2ce93663f409f471ea83a6d5fbb5
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/5] image-root-squashfs: add zstd compression option

[Bruno Thomsen]

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>
---
 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

[ptxdist] [PATCH 3/5] host-squashfs-tools: add support for zstd contitional

[Bruno Thomsen]

Only enable host zstd package dependency when needed,
so it doesn't build unnecessary packages.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/host-squashfs-tools.in   |  1 +
 rules/host-squashfs-tools.make | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

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..45d69ba8b 100644
--- a/rules/host-squashfs-tools.make
+++ b/rules/host-squashfs-tools.make
@@ -21,8 +21,16 @@ HOST_SQUASHFS_TOOLS_SUBDIR	:= squashfs-tools
 # Compile
 # ----------------------------------------------------------------------------
 
-HOST_SQUASHFS_TOOLS_MAKE_OPT := LZO_SUPPORT=1 XZ_SUPPORT=1
-HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"
+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 -L$(PTXDIST_SYSROOT_HOST)/usr/local/lib64" \
+	CPPFLAGS="-I$(PTXDIST_SYSROOT_HOST)/usr/local/include"
+
 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

[ptxdist] [PATCH 4/5] host-squashfs-tools: conditional select lzo and xz dependencies

[Bruno Thomsen]

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>
---
 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 45d69ba8b..a453ae18a 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 := \
-- 
2.26.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 5/5] host-squashfs-tools: fix lz4 compression option

[Bruno Thomsen]

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>
---
 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 a453ae18a..9f7140c60 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

Re: [ptxdist] [PATCH 1/5] host-zstd: new package

[Michael Olbrich]

On Thu, Jul 16, 2020 at 07:38:01PM +0200, Bruno Thomsen wrote:
> This package can be used by squashfs-tools.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
>  rules/host-zstd.in   |  6 ++++++
>  rules/host-zstd.make | 42 ++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 48 insertions(+)
>  create mode 100644 rules/host-zstd.in
>  create mode 100644 rules/host-zstd.make
> 
> diff --git a/rules/host-zstd.in b/rules/host-zstd.in
> new file mode 100644
> index 000000000..18d291672
> --- /dev/null
> +++ b/rules/host-zstd.in
> @@ -0,0 +1,6 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_ZSTD
> +	tristate
> +	select HOST_CMAKE
> +	default y if ALLYES
> diff --git a/rules/host-zstd.make b/rules/host-zstd.make
> new file mode 100644
> index 000000000..e6096d0de
> --- /dev/null
> +++ b/rules/host-zstd.make
> @@ -0,0 +1,42 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Bruno Thomsen <bruno.thomsen@gmail.com>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_HOST_ZSTD) += host-zstd
> +
> +#
> +# Paths and names
> +#
> +HOST_ZSTD_DIR		:= $(HOST_BUILDDIR)/$(ZSTD)
> +HOST_ZSTD_SUBDIR	:= build/cmake
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +HOST_ZSTD_CONF_TOOL	:= cmake
> +HOST_ZSTD_BUILD_DIR	:= $(HOST_ZSTD_DIR)-build
> +HOST_ZSTD_CONF_OPT	:= \
> +	$(HOST_CMAKE_USR) \

	$(HOST_CMAKE_OPT) \

HOST_CMAKE_USR is not defined.

This will set the prefix correctly.

Michael

> +	-B$(HOST_ZSTD_BUILD_DIR) \
> +	-DZSTD_LEGACY_SUPPORT=OFF \
> +	-DZSTD_MULTITHREAD_SUPPORT=ON \
> +	-DZSTD_BUILD_PROGRAMS=ON \
> +	-DZSTD_BUILD_CONTRIB=OFF \
> +	-DZSTD_BUILD_TESTS=OFF \
> +	-DZSTD_USE_STATIC_RUNTIME=OFF \
> +	-DZSTD_PROGRAMS_LINK_SHARED=ON \
> +	-DZSTD_BUILD_STATIC=OFF \
> +	-DZSTD_BUILD_SHARED=ON \
> +	-DZSTD_ZLIB_SUPPORT=OFF \
> +	-DZSTD_LZMA_SUPPORT=OFF \
> +	-DZSTD_LZ4_SUPPORT=OFF
> +
> +# vim: syntax=make
> 
> base-commit: 9fe5462616de2ce93663f409f471ea83a6d5fbb5
> -- 
> 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

Re: [ptxdist] [PATCH 3/5] host-squashfs-tools: add support for zstd contitional

[Michael Olbrich]

On Thu, Jul 16, 2020 at 07:38:03PM +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>
> ---
>  rules/host-squashfs-tools.in   |  1 +
>  rules/host-squashfs-tools.make | 12 ++++++++++--
>  2 files changed, 11 insertions(+), 2 deletions(-)
> 
> 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..45d69ba8b 100644
> --- a/rules/host-squashfs-tools.make
> +++ b/rules/host-squashfs-tools.make
> @@ -21,8 +21,16 @@ HOST_SQUASHFS_TOOLS_SUBDIR	:= squashfs-tools
>  # Compile
>  # ----------------------------------------------------------------------------
>  
> -HOST_SQUASHFS_TOOLS_MAKE_OPT := LZO_SUPPORT=1 XZ_SUPPORT=1
> -HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"
> +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 -L$(PTXDIST_SYSROOT_HOST)/usr/local/lib64" \
> +	CPPFLAGS="-I$(PTXDIST_SYSROOT_HOST)/usr/local/include"

The /usr/local paths should not be necessary with the fixed host-zstd
package.

Michael

> +
>  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

Re: [ptxdist] [PATCH 3/5] host-squashfs-tools: add support for zstd contitional

[Bruno Thomsen]

Den fre. 17. jul. 2020 kl. 08.35 skrev Michael Olbrich
<m.olbrich@pengutronix.de>:
>
> On Thu, Jul 16, 2020 at 07:38:03PM +0200, Bruno Thomsen wrote:
> > Only enable host zstd package dependency when needed,
> > so it doesn't build unnecessary packages.
> >
> >
> > -HOST_SQUASHFS_TOOLS_MAKE_OPT := LZO_SUPPORT=1 XZ_SUPPORT=1
> > -HOST_SQUASHFS_TOOLS_MAKE_ENV := $(HOST_ENV) EXTRA_LDFLAGS="-L$(PTXDIST_SYSROOT_HOST)/lib/xz"
> > +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 -L$(PTXDIST_SYSROOT_HOST)/usr/local/lib64" \
> > +     CPPFLAGS="-I$(PTXDIST_SYSROOT_HOST)/usr/local/include"
>
> The /usr/local paths should not be necessary with the fixed host-zstd
> package.

Hi Michael,

Thanks for the review.
It makes sense, I will fix that in the next version.

There are some cross rules optimizations in the next patches,
they remove the compile of some unneeded packages in my example
but it might break something I don't know.

/Bruno

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de