mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Bruno Thomsen <bruno.thomsen@gmail.com>
Subject: Re: [ptxdist] [APPLIED] squashfs-tools: add zstd compression support
Date: Fri, 17 Jul 2020 13:57:09 +0200	[thread overview]
Message-ID: <E1jwOzF-00054v-7a@dude02.hi.pengutronix.de> (raw)
In-Reply-To: <20200716172133.4351-1-bruno.thomsen@gmail.com>

Thanks, applied as e37db9dbf300a5921055a47748291dcc580feca0.

Michael

[sent from post-receive hook]

On Fri, 17 Jul 2020 13:57:09 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> ZSTD_LIBZSTD is needed runtime and ZSTD is needed compile
> time. Kconfig options has been separated into build and
> install options, so it's easier to extend with more e.g.
> compression types.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200716172133.4351-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/squashfs-tools.in b/rules/squashfs-tools.in
> index a90153ae13fb..9e4f48550c1b 100644
> --- a/rules/squashfs-tools.in
> +++ b/rules/squashfs-tools.in
> @@ -6,6 +6,8 @@ menuconfig SQUASHFS_TOOLS
>  	select LIBC_PTHREAD
>  	select GCCLIBS_GCC_S
>  	select ZLIB
> +	select ZSTD		if SQUASHFS_TOOLS_ZSTD_SUPPORT
> +	select ZSTD_LIBZSTD	if SQUASHFS_TOOLS_ZSTD_SUPPORT
>  	prompt "squashfs-tools                "
>  	help
>  	  Squashfs is a highly compressed read-only filesystem for Linux.
> @@ -16,6 +18,14 @@ menuconfig SQUASHFS_TOOLS
>  
>  if SQUASHFS_TOOLS
>  
> +comment "build options"
> +
> +config SQUASHFS_TOOLS_ZSTD_SUPPORT
> +	bool
> +	prompt "Support Zstandard (zstd) compression"
> +
> +comment "install options"
> +
>  config SQUASHFS_TOOLS_MKSQUASHFS
>  	bool
>  	prompt "Install mksquashfs"
> diff --git a/rules/squashfs-tools.make b/rules/squashfs-tools.make
> index 6afd44ddf897..4b9581883979 100644
> --- a/rules/squashfs-tools.make
> +++ b/rules/squashfs-tools.make
> @@ -30,6 +30,7 @@ SQUASHFS_TOOLS_LICENSE	:= GPL-2.0-or-later
>  
>  SQUASHFS_TOOLS_MAKE_PAR := NO
>  SQUASHFS_TOOLS_MAKE_ENV := \
> +	ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0) \
>  	$(CROSS_ENV)
>  
>  SQUASHFS_TOOLS_INSTALL_OPT := \

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

      reply	other threads:[~2020-07-17 11:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-16 17:21 [ptxdist] [PATCH] " Bruno Thomsen
2020-07-17 11:57 ` Michael Olbrich [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1jwOzF-00054v-7a@dude02.hi.pengutronix.de \
    --to=mol@pengutronix.de \
    --cc=bruno.thomsen@gmail.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox