From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jxX7o-0006zP-Fe for ptxdist@pengutronix.de; Mon, 20 Jul 2020 16:50:40 +0200 Received: by mail-wm1-x341.google.com with SMTP id f18so25437828wml.3 for ; Mon, 20 Jul 2020 07:50:40 -0700 (PDT) From: Bruno Thomsen Date: Mon, 20 Jul 2020 16:50:30 +0200 Message-Id: <20200720145032.4274-3-bruno.thomsen@gmail.com> In-Reply-To: <20200720145032.4274-1-bruno.thomsen@gmail.com> References: <20200720145032.4274-1-bruno.thomsen@gmail.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2 3/5] host-squashfs-tools: add support for zstd contitional List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Bruno Thomsen , bth@kamstrup.com Only enable host zstd package dependency when needed, so it doesn't build unnecessary packages. Signed-off-by: Bruno Thomsen --- 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