From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jysXE-0001zY-D0 for ptxdist@pengutronix.de; Fri, 24 Jul 2020 09:54:28 +0200 Received: from mol by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1jysXE-0000eW-43 for ptxdist@pengutronix.de; Fri, 24 Jul 2020 09:54:28 +0200 Date: Fri, 24 Jul 2020 09:54:28 +0200 From: Michael Olbrich Message-ID: <20200724075428.GC31910@pengutronix.de> References: <20200720145032.4274-1-bruno.thomsen@gmail.com> <20200720145032.4274-3-bruno.thomsen@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200720145032.4274-3-bruno.thomsen@gmail.com> Subject: Re: [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 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 > --- > 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