From patchwork Mon Apr 9 20:04:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 896389 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Kh972JPzz9s4q for ; Tue, 10 Apr 2018 06:04:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A5074863BA; Mon, 9 Apr 2018 20:04:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1dpOvAL+sIxY; Mon, 9 Apr 2018 20:04:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5BF978642A; Mon, 9 Apr 2018 20:04:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3292E1C2C7D for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2FB27859C1 for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wOUGA4tOgQxV for ; Mon, 9 Apr 2018 20:04:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by fraxinus.osuosl.org (Postfix) with ESMTPS id DBE58859E3 for ; Mon, 9 Apr 2018 20:04:34 +0000 (UTC) Received: from localhost.localdomain ([178.10.176.230]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Lkzph-1eX75X0WOr-00ajAJ; Mon, 09 Apr 2018 22:04:30 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Mon, 9 Apr 2018 22:04:24 +0200 Message-Id: <20180409200429.22650-1-ps.report@gmx.net> X-Mailer: git-send-email 2.16.3 X-Provags-ID: V03:K1:yLJ10L2O6SPMM00herW3twBAls3/nYWev4wq4UR8090u8gmWGJl DpRS/hPnm2hRtBHXItNblO+2iAUJcoSXkm4Yr9WnPxLOFArObQVYKSW5ye8zxosdp3tfViO 1fc34PbvcdOq+JMjflaUngnVvH3hVy2ZUYp37Eo9/+DJzCaC6oKnWXX6AFVLd7y/PvuI3qz 36bQKTF/2fMxCYJnedFgQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:UvK+CayKGpU=:PxpHKr56J2M0v3tb6xmDC9 VLmWn2I4ELkdPaf32r+ss0ee8cDQdKzkBPdEOduoFqu1dVtXVnSpriov+uFaAlYuCMokS1xJR 5148xJrclL5QU611gjcEjySqesOwxyg3XHkA8WtoxdtmCkrkKBb1JYE4VTOIqIIrLQ6L/rZo4 F0i0tmubi9BYc0WhI3uWoDE9DF7IgcqAUtd9SbjT6KcpCCYJijIvt0/I2ADKa1UjD7I5KUkor Wzy0IZAcsgAtFDEWzKytmRZirESKfsovKK4v/j2I54jDoHSETGZgUqZ0+E/2w0LlEt8MHrg4M //dMF2h06rxO16WOKNXQR43ZQcsa4zqgRNDaG57ELaAlFwdZL0KzcqyLvylOX8wITILcaIctF +krGEFDLOEuTjZ1h/y4NjXKVVsrLqyJ8cMjoR5Us9sX1AtSeHOgaWnSXSqUXDIVhCbG4cZRms n0b8HVJ91SP39CtdKmZ3W2aM/dqcNNZsQUlJE11boCYDLgVrSiBWpA29RFiZFPdt34GfXgUL1 y4u15beEBwnQo/HtJ019blnCb6ROeTcCKOUfGU48ob5zQjkB/gnYms3VsIwo+Qz5nJgPly26x ATucd+dbar2QHxL+gpE6oZSPvXG8ZoaMiSMtDq/dhVhAGXEwJK0KLgOmUHIPqMlYsbE8hDLuI iqQM44tJpQdHamrYnPQY3Bkz/GP2yZ2KWbVJ4CC/fh6hMxYX8okw0TbwxymNJSXy1wRoAGMsv blKwF3RokQBYs54KwLsSxYFeA6y3qwqfQqqmfZX5P/hu0FEi8qffyRLX8AUTu6BgJh0Plhgb0 TAm/MDxDBbWY61vW+jEdhCE+hSqTQ== Subject: [Buildroot] [PATCH v2 1/6] squashfs: bump version to e38956b92f738518c29734399629e7cdb33072d3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , "Yann E . MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - delete patch 0001-musl.patch (superseeded by upstream commit [1]) - disable new zstd support for host/target [1] https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git/commit/?id=a81678d6a698b8a016f9abac9f3d981281cc52eb Signed-off-by: Peter Seiderer Reviewed-by: "Yann E. MORIN" --- Changes v1 -> v2: - split off zstd support to extra patches (suggested by Yann E. MORIN) --- package/squashfs/0001-musl.patch | 71 ---------------------------------------- package/squashfs/squashfs.hash | 2 +- package/squashfs/squashfs.mk | 7 ++-- 3 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 package/squashfs/0001-musl.patch diff --git a/package/squashfs/0001-musl.patch b/package/squashfs/0001-musl.patch deleted file mode 100644 index 891b1717a2..0000000000 --- a/package/squashfs/0001-musl.patch +++ /dev/null @@ -1,71 +0,0 @@ -Fix musl build - -Downloaded from -http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch -and adjusted paths. - -Signed-off-by: Bernd Kuhls - -Define FNM_EXTMATCH if not defined its glibc specific define -include missing sys/stat.h for stat* function declarations - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: squashfs-tools/action.c -=================================================================== ---- a/squashfs-tools.orig/action.c -+++ b/squashfs-tools/action.c -@@ -44,6 +44,10 @@ - #include "action.h" - #include "error.h" - -+#if !defined(FNM_EXTMATCH) -+#define FNM_EXTMATCH 0 -+#endif -+ - /* - * code to parse actions - */ -Index: squashfs-tools/mksquashfs.c -=================================================================== ---- a/squashfs-tools.orig/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st - dir_size + 3, directory_block, directory_offset, NULL, NULL, - dir, 0); - -+#if !defined(FNM_EXTMATCH) -+#define FNM_EXTMATCH 0 -+#endif -+ - #ifdef SQUASHFS_TRACE - { - unsigned char *dirp; -Index: squashfs-tools/pseudo.c -=================================================================== ---- a/squashfs-tools.orig/pseudo.c -+++ b/squashfs-tools/pseudo.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - - #include "pseudo.h" -Index: squashfs-tools/unsquashfs.c -=================================================================== ---- a/squashfs-tools.orig/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -38,6 +38,10 @@ - #include - #include - -+#ifndef FNM_EXTMATCH -+#define FNM_EXTMATCH 0 -+#endif -+ - struct cache *fragment_cache, *data_cache; - struct queue *to_reader, *to_inflate, *to_writer, *from_writer; - pthread_t *thread, *inflator_thread; diff --git a/package/squashfs/squashfs.hash b/package/squashfs/squashfs.hash index 74fdb44354..82a650022c 100644 --- a/package/squashfs/squashfs.hash +++ b/package/squashfs/squashfs.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2c49392816615b73bf5d6cdce9776cb66a01f5a1494b1d9af580667e32bab001 squashfs-3de1687d7432ea9b302c2db9521996f506c140a3.tar.gz +sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 9599d892b2..e656218f97 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -4,12 +4,12 @@ # ################################################################################ -SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3 +SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3 SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git SQUASHFS_SITE_METHOD = git SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING -SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 +SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ZSTD_SUPPORT=0 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) SQUASHFS_DEPENDENCIES += lz4 @@ -54,7 +54,8 @@ HOST_SQUASHFS_MAKE_ARGS = \ GZIP_SUPPORT=1 \ LZ4_SUPPORT=1 \ LZO_SUPPORT=1 \ - LZMA_XZ_SUPPORT=1 + LZMA_XZ_SUPPORT=1 \ + ZSTD_SUPPORT=0 define SQUASHFS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) \ From patchwork Mon Apr 9 20:04:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 896392 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Kh9D43TXz9s4s for ; Tue, 10 Apr 2018 06:04:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9ADF785F6C; Mon, 9 Apr 2018 20:04:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NWsCGaK-OUM1; Mon, 9 Apr 2018 20:04:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 870F7859E3; Mon, 9 Apr 2018 20:04:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 815761C2C7D for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7DFD8863A6 for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nzwEAg6YU0jL for ; Mon, 9 Apr 2018 20:04:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by whitealder.osuosl.org (Postfix) with ESMTPS id E5CF086359 for ; Mon, 9 Apr 2018 20:04:34 +0000 (UTC) Received: from localhost.localdomain ([178.10.176.230]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MZ7bs-1emrgY1VzI-00KzdK; Mon, 09 Apr 2018 22:04:30 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Mon, 9 Apr 2018 22:04:25 +0200 Message-Id: <20180409200429.22650-2-ps.report@gmx.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180409200429.22650-1-ps.report@gmx.net> References: <20180409200429.22650-1-ps.report@gmx.net> X-Provags-ID: V03:K1:tyvTcS2wgsBKqVCf4nSsRtYPUmoyb6YaxU5mhtSsoeConvswQbd T4aJ+ibys/f5vhECyD2P6RH5wqnmqlFuERqqClam+ZHzcP76gMLCJnWY74NI+Tc10iZnVVF vaYh/kYfkN0pGuYexLxe4A0SK2uli4SU/33iTkzEsCmxDgni+m8XulKjirH77UPpgD0EQGI EFXfarrwvw1Rd3VAuMFRQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:IYr+qYz1TMU=:uVPa2TfeR7a6U2UAJyFLu0 XV6sRtL8LcFSMVyJ+t85Yikn5ZRONeHv36ZKAIrDXd594Dz/j8qEd/op37Cl8+94sVCZgxNHT qoln/SS14KyNiy10jHy6Nmzt1trZSaQ8epCSQCxVvD7bTsRAUUC9lAEHyxt/PjJ5Ts7nkXY7l 8bYkjeN9KQchHi/6jpswmaPRMBEKUJwnUNIG1F9PeAPWPN707TGgIS+LiD/LiHepJUo3y8eJA IywZ3sMUR6dWk1o07wAO45vcRee9dMwevP7qNfLwLZCjCxz5dryCZUU7NNxChwa1GtbM6dUgw 5qkr+jiA/GZMsq7QXeN+YOu3KJH0CzV++JNjIdV7QEqJSA9bpxnhOakrSmwcnsJmPMbyOrmG5 bxZ2J9BGNJFMVSKogirJOqJdrHfOc7hW5X4Pis0m5707W8+osrzc6lKEhdugK0A65eO4e4D+l FdcXRBGVGScbAq1bsE0egg7hcWKwCTYxET3bbMD3nBX2B6ZPagWISUxjg8RnvlYbvaeUQ3rE8 wpYkWhrUR7q9KalFZ4Av0AnEjM4PWr5fFdGVj2MOUfSzabSgEae2lyCdo5n0rtoQa7sJML8Ho 4V65zT81qWehQds5mZuzxJt+lvrxRiCPLXqo15PiJK5TdwhndH0X2w8+NZfZ8WsdbNcIQaPys tOACqoNTFcCsPPd4HxCyYp7x1geXgCZoVW7wTQoM4w9zM+OmQa09TnXG8cFY901606APR6W20 jOq2SbsxAaeG14GknnYOdCx8w2JBUgDeHhNnN0RemdUqg/iuq/bQIsTK+k6uOM1HRYJ4LvFN+ +o7iewbTGE4RVld70TUuYOf0ZWsAQ== Subject: [Buildroot] [PATCH v2 2/6] zstd: add host libzstd support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , "Yann E . MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split off host libzstd support (suggested by Yann E. MORIN) - no ZSTD_OPTS for host libarary build --- package/zstd/zstd.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index c0fa88026c..1b76b0164c 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -46,4 +46,16 @@ define ZSTD_INSTALL_TARGET_CMDS DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/programs install endef +# note: no 'HAVE_...' options for host library build only +define HOST_ZSTD_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + -C $(@D) lib +endef + +define HOST_ZSTD_INSTALL_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) \ + DESTDIR=$(HOST_DIR) PREFIX=/usr -C $(@D)/lib install +endef + $(eval $(generic-package)) +$(eval $(host-generic-package)) From patchwork Mon Apr 9 20:04:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 896391 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Kh9B3hYrz9s4Z for ; Tue, 10 Apr 2018 06:04:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1175C87CFD; Mon, 9 Apr 2018 20:04:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9I9hIvBJY844; Mon, 9 Apr 2018 20:04:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CD8C787CF2; Mon, 9 Apr 2018 20:04:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5A9471C2C7D for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 57F75227CB for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GUXYysejRrJ0 for ; Mon, 9 Apr 2018 20:04:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by silver.osuosl.org (Postfix) with ESMTPS id F2E1522646 for ; Mon, 9 Apr 2018 20:04:34 +0000 (UTC) Received: from localhost.localdomain ([178.10.176.230]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LoKHN-1eYF9T2HtJ-00gDsN; Mon, 09 Apr 2018 22:04:30 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Mon, 9 Apr 2018 22:04:26 +0200 Message-Id: <20180409200429.22650-3-ps.report@gmx.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180409200429.22650-1-ps.report@gmx.net> References: <20180409200429.22650-1-ps.report@gmx.net> X-Provags-ID: V03:K1:+b7+Memry91ZtRgtKkroBX7w6v2XndieXJbX4KYOrj8DqyC9hrl RIIAzfigpwv8O2UEjKz/UqxGoSc+dHY4O20qM3xfwbvt0JYBBPQT8rXno4dO8R5U7Ql3OmG fCWO2oKin2IGSwbmy6SzlDaZkxU7qhA4LEciyblHN/8NE21lORAtan4TzNAUvD4F/0auwFH PMQT1DYCCdm0+dOPbQHgA== X-UI-Out-Filterresults: notjunk:1; V01:K0:wgFZynUcUZU=:9usln0lRgC3upQA1tdH+DX fGB3wzFjZ6UPovcv2LgEQwYxhmSANXmI5GYacC/eLds8G8CROED6KKqqK3U4nf+x5lgXO0N9J bZnmHpzbjDlptWCnurNzh7jXNLzRTPEy5YlF1crY8XfbgJHG6RJVBz+o211HXXXwMRDL6Hkbx uZtv6kb+WmkvUZhDpOTiEQiQIfWcq/Bom45GFg6cxr4wfLkWpmtdZLbrcgd7YBVDY/WTGxvxM xVSryNwfvLSuWCCgQotQ8aBZ1OEPRnIHOGTJdDcD0j7/WWTbyMCyEHDquWFNNOdUS5yBtGTIN ITjVruhOpGrJ+JSwLvNeX+2jbFmPQWP9s344j2xfwof0FNrr5U2y6RGWt9tAzj5oT95w9WZcb YCltmu7RlVGD7+2dCAZ91Emc99BWYWe45vQS2Imsd+K7LK8IisaIy1OdiMhbr9j4nbnZljgo3 WPm/wyw6R5f8ypQs8hmNtVqI2V3/3FWB9Q4H7u+qePza1KRZ+EM1jvAxJx7fmDi85aFr5zTKt /VvyRnXzRllsdkKIUv0E0XIlR1pAc1yjVq1YIm5q1BiM5da9apv5H5K8Uh3OiZImonIBf6Ngj Kupo7/Q+TUWdWCPFGI2jZlfjX6haxgdJxHDa0e+JV+tyMwdYsVN36pAaeOUGBBdgfbB6PCgZp zT2Wxuo3IPVzFyFrCc3J5lkFue61BPeCDtn/SndVxajwmYJDZ5qroD81HQSwqK1azaBfx8Cm2 TZu25IP34rXsumm5uQGYd6Fb68TOtXq8PTfX7X+VXhIXx9h5JvHFxQtIFiq8oEfaBPpyzuqEg ygiZhYXbbeD13VAmCmE3Rks3W5jRQ== Subject: [Buildroot] [PATCH v2 3/6] squashfs: add host zstd support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , "Yann E . MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer Reviewed-by: "Yann E. MORIN" --- Changes v1 -> v2: - split off host zstd support (suggested by Yann E. MORIN) --- package/squashfs/squashfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index e656218f97..67025ac68a 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -46,7 +46,7 @@ else SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0 endif -HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz +HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz host-zstd HOST_SQUASHFS_MAKE_ARGS = \ XATTR_SUPPORT=1 \ @@ -55,7 +55,7 @@ HOST_SQUASHFS_MAKE_ARGS = \ LZ4_SUPPORT=1 \ LZO_SUPPORT=1 \ LZMA_XZ_SUPPORT=1 \ - ZSTD_SUPPORT=0 + ZSTD_SUPPORT=1 define SQUASHFS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) \ From patchwork Mon Apr 9 20:04:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 896390 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Kh970x93z9s4p for ; Tue, 10 Apr 2018 06:04:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C2186863D9; Mon, 9 Apr 2018 20:04:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 51awjNfvHt32; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 974AA863A6; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0B1551C2C7D for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0860E859EB for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PaZSivk402O4 for ; Mon, 9 Apr 2018 20:04:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by fraxinus.osuosl.org (Postfix) with ESMTPS id DBC02859C1 for ; Mon, 9 Apr 2018 20:04:34 +0000 (UTC) Received: from localhost.localdomain ([178.10.176.230]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MLR30-1f54nM36na-000ZbI; Mon, 09 Apr 2018 22:04:30 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Mon, 9 Apr 2018 22:04:27 +0200 Message-Id: <20180409200429.22650-4-ps.report@gmx.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180409200429.22650-1-ps.report@gmx.net> References: <20180409200429.22650-1-ps.report@gmx.net> X-Provags-ID: V03:K1:P5x7hCqmxDihnIJ2Pq6+mFQlLw0EZINDPMhlyNcqkt2Pfp3O/AX v+c8/0+htKyujUpwezOHXSKLHKc2ZhjLIBPg0MrDoJq5kkKNsF5I29nCEqDQ7yDgtta4ik+ bg6+5Xyc8W/eudgBP32WzIGCcl4S89l5SWcVgH1dWrh9/YPoLuF4n39dOdbyjdLSl6hF5M1 gj4qC4upn/7bkdPQ9sRVA== X-UI-Out-Filterresults: notjunk:1; V01:K0:zS32g/mOtuE=:3ixS6t+CvtdO9Stetj7eSt ieonQoH1MQZ4GjSPfCTHLRhEfA2ClxMkg16BqKYWfDVceIFJSkknLz/1t4UeuHsJcdkE5g8Uc 7vrm33nrdG56szT2+qdmpWdeGH69ntsxDfK1K4Z4nmPWMWgHTa2MiEQKK0/4M/n+72jK0y9yu yxxEFtT8JhS5wGXPrS0MU2MepC8HzjXBE8kABu6am1jfLuM1oyy+/97eLXg/VSg3/dg5h0cSP sHhmGvcgD0chwyPpMoPvSlNR8Eo+gSuaneqGM9KGpc7ZyfZRABHBX13F610NwJiNVFGv7sn+k VFblYSsNo4Zih+ixLa8CZ9gtLbfKI46xUYfo+nf5FhYIBPpaRCbbLQHxO+e5fbKgn201bUfm1 Ph7SLT5uPycBxMSEYgpV5oEfw9EVsaDsIFWM0o2A9lhH4EsAPohNRo7kdW9Xo7xqVAu2wN41l dp+NAOc1pFgIHdqRbwt59zSaUCfEV8EitQqDNfzRELiToMqiNuddgDY2OZzSutBaXentSgPDH xX3kWNJa5Bbp6NcRoBHbKME2UsrOWwmq4HTPsRefcVNFkou+mfNomDyFNOiaaJQR78axBjYTw WKkDLWgMqx9PotN9Ego8CvsYgYITm6ahcOXxkZJr4TsB0Q95rvWrJaMorjqkHaYQktLlKYXG+ 47Y1e/6TnMTBlmhPcPL4oLRprrHnJMmEz7QvuFGXPD5ai9bGJHFQSN9lkLwes38LiOSctWxzV v0/4U+CnEfED6RmZsI2mJ489HlhNbVjlDjCdEPYUUqjLTk4hlLIX5FrohdggQk/cZ4NX4XUP0 svGUcCu9NGPkPPhab9zBmAH3rBOkw== Subject: [Buildroot] [PATCH v2 4/6] fs/squashfs: add zstd support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , "Yann E . MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer Reviewed-by: "Yann E. MORIN" --- Changes v1 -> v2: - add reviewed-by: Yann E. MORIN --- fs/squashfs/Config.in | 3 +++ fs/squashfs/squashfs.mk | 2 ++ 2 files changed, 5 insertions(+) diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in index ca9ddb2218..dde2097cb7 100644 --- a/fs/squashfs/Config.in +++ b/fs/squashfs/Config.in @@ -27,5 +27,8 @@ config BR2_TARGET_ROOTFS_SQUASHFS4_LZO config BR2_TARGET_ROOTFS_SQUASHFS4_XZ bool "xz" +config BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD + bool "zstd" + endchoice endif diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index 51abd5d7d0..34ab048603 100644 --- a/fs/squashfs/squashfs.mk +++ b/fs/squashfs/squashfs.mk @@ -16,6 +16,8 @@ else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y) ROOTFS_SQUASHFS_ARGS += -comp lzma else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y) ROOTFS_SQUASHFS_ARGS += -comp xz +else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_ZSTD),y) +ROOTFS_SQUASHFS_ARGS += -comp zstd else ROOTFS_SQUASHFS_ARGS += -comp gzip endif From patchwork Mon Apr 9 20:04:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 896393 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Kh9F3gRkz9s3L for ; Tue, 10 Apr 2018 06:04:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B03B385F76; Mon, 9 Apr 2018 20:04:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tgemu0sFfbtL; Mon, 9 Apr 2018 20:04:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4304985D4C; Mon, 9 Apr 2018 20:04:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 8E9F51CF12F for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8BAEC87CF2 for ; Mon, 9 Apr 2018 20:04:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RYfbRO+DdQcW for ; Mon, 9 Apr 2018 20:04:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by hemlock.osuosl.org (Postfix) with ESMTPS id F351187CF0 for ; Mon, 9 Apr 2018 20:04:34 +0000 (UTC) Received: from localhost.localdomain ([178.10.176.230]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MgYGJ-1ese3F3vpn-00NzlZ; Mon, 09 Apr 2018 22:04:31 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Mon, 9 Apr 2018 22:04:28 +0200 Message-Id: <20180409200429.22650-5-ps.report@gmx.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180409200429.22650-1-ps.report@gmx.net> References: <20180409200429.22650-1-ps.report@gmx.net> X-Provags-ID: V03:K1:bXdhDSoDThE74WjgBC2ATuoyzEiYjlo7CYGKDrKJSp7cul2gdTa 7RpC+UOQoO3qWRpMO0tVn12xnnlFihIJwJbAAzrIH4AnCqoSHII5VPgH3ncTqWnCU9UIXdg SL2ZOEaPq4bvEU6viX6te1ZC4p5T7T2ZAlCUGryBi/5GH7aF8AiOAhr5Fxkd3eTTPoOIm0F GxgzbghYlTW4gTUdaFPdw== X-UI-Out-Filterresults: notjunk:1; V01:K0:obr7l94jmHU=:Svy9pTYbd874sqjYCuPxlj GoGYxayEo+xVV5eba9lpka5OvsyAqxbnvWlWCB+rhAMJdIEpzcVjFxCCuTy7fjx3RKEuEeL/Z Si5dEuHh3mljcCyeTtcIDW0rsUGGNEIZZWV63rjFRf7Zq7sUs/txm3hd3pkPHp8d/HI2joQZV vFx6u5imnldjZAOvG7pyEDdjyN/wNfWr/57/2hTUNgifb24HKmcMV6Z10py/1U5EVEM4LS/1w KozF0u6bNcMXiaPStcL+jRI40d4BIL6XfUDWLR/SwSLFJyctx63QZRuJEeu05Go7FSEP8mc2c E+sNHjxAcS7BhQK6jUxWoDBfoBPYcvDVFjkIGyQTzVOOgiLnlVGB9z1B4vNVS4iIgzE4fkTxT WIs8I3ZgCjHmzQXU6st6HQgdjQvy3BXK6f1xPK9m1QIjeYMNvkAHaAFYPb6sEaUoO1Iq6yaPm 3Ku3cBvFAtTblpUb6kenp2Af9ZhhjFrUgtm+/2BFv9VG4PY0rPNE4WJT7o8hlvOqQ8UiTCofV 6pdalBmJMB3voAWvUOl/Y12p/IBQfN2x7PGV5WmRtbo6b2wR1EmQguJrAj2PliPAMoP5QJoUR LZU/Nt7l//ku4+mEaCZIIlDsrFMF7M1EyGvZ83aLgB4KFbe4g+Vl2EPRCU3AkOewXqirgiKWl GAVrjwavF57wpGay8znebWlammdTUupYajdkBp2P4qKHaarVkpkidpsEkZoUGsqTjCwZdC4N0 X8evKa+GkRGEho7gEJP2jsl2H/rjoCyaMiBJGcLSOmNMTgOecU2GTQZ7l+vx9YmPYKpVRAhxJ 02wrlDHFqDiBvHZjvB6SbbJbkS6kQ== Subject: [Buildroot] [PATCH v2 5/6] zstd: add libzstd support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , "Yann E . MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split off target libzstd support (suggested by Yann E. MORIN) --- package/zstd/zstd.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 1b76b0164c..cccec3a313 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -6,6 +6,7 @@ ZSTD_VERSION = v1.3.3 ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION)) +ZSTD_INSTALL_STAGING = YES ZSTD_LICENSE = BSD-3-Clause or GPL-2.0 ZSTD_LICENSE_FILES = LICENSE COPYING @@ -38,10 +39,17 @@ endif define ZSTD_BUILD_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ - -C $(@D) zstd + -C $(@D) lib zstd +endef + +define ZSTD_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ + DESTDIR=$(STAGING_DIR) PREFIX=/usr -C $(@D)/lib install endef define ZSTD_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ + DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/lib install $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \ DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/programs install endef From patchwork Mon Apr 9 20:04:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 896394 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Kh9L0pcWz9s3X for ; Tue, 10 Apr 2018 06:04:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9BE9B859EB; Mon, 9 Apr 2018 20:04:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ik4WEVfTwBqi; Mon, 9 Apr 2018 20:04:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3737485F48; Mon, 9 Apr 2018 20:04:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 65DF61C2C7D for ; Mon, 9 Apr 2018 20:04:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5FFA522646 for ; Mon, 9 Apr 2018 20:04:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3rBIuQ2U9nEb for ; Mon, 9 Apr 2018 20:04:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by silver.osuosl.org (Postfix) with ESMTPS id F30C8227C7 for ; Mon, 9 Apr 2018 20:04:34 +0000 (UTC) Received: from localhost.localdomain ([178.10.176.230]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M34eJ-1eEtRo0WgR-00swnx; Mon, 09 Apr 2018 22:04:31 +0200 From: Peter Seiderer To: buildroot@buildroot.org Date: Mon, 9 Apr 2018 22:04:29 +0200 Message-Id: <20180409200429.22650-6-ps.report@gmx.net> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180409200429.22650-1-ps.report@gmx.net> References: <20180409200429.22650-1-ps.report@gmx.net> X-Provags-ID: V03:K1:TwvcTqUHNcH/WBkMnbScx4AjfkHbhqJzFkFtaEyvMW+p7QaDEIX zezA59bhsD7Vu/WoL3iY7dCLORcV7vYJI59BGMo5X5ujj9ey6pNmmVDKZPk3GSuKYWoWOcR zqlolIf18OrVAOBsAQkvVXq5HxUTQ/DlxzdgEgswtD+mFGZaNR5YEbll/GSe6bQjy3x8Pi9 dLh14ld0tLFUTVu9+/Eqg== X-UI-Out-Filterresults: notjunk:1; V01:K0:Hz7CYN1LBC4=:saMjv83ZBSxoQkL0YhlQXL KvlkT1kn4lQ8HJ88E6HgVKmJAT7NKunxToLq608qbFuZMjFDJ8BfvowDWrNCq0fQCOVIVXHCe bDm1vhhmEHa6QlFXUkSj39KuHWjukz2RX9/BuO2U613U/Mwi9lmu99gKQRLq+LsMmZN796Au2 qR/nVWF267zi0XI/CApKgTX4a84q/WKuVK34rMd8j2tDYYmZQkHneliR+Ltr0eF6d5w8sFN+d mBBx/W2LA0FieVFqaSFUqPJ8d7at/eJVNqXOW0nBdESRbnls9jRuCYOMxWrAdVCTS1vJQUeAe wlto21ySy3XfhkTXHF1hmEoKqAMXZm7KGqPEwTnNP3PSbpyrUNx1QWqAaX2IScxQ3554RyuEa umwswSU1QW4x6LsNLGNj+l0/GcucsfXFdMmBE0E7zlzbl2BAFuJD5kDR6njbMOkwmh4WLt2cP Voanb9LtqlhJjddudtCzOawufXbmiEZO3fzciLxNAzLGDbO4Orq63crq2cSXEiK3sxkta3L2t kyv/G95c5KIeLn966tmtx0XtXMm+F4edel480qgYEOX3I1b8k3Hca2hVpECvmIeilMoeq5hEb YpRH8bl7ERep86HKkqmIAVZ0R0k6OrOlRLYEtXheOroqZu296usDiSa1jDh4VLczey8WKidlR vmEPfWA4i2kAwxCy/g48Y00/Uk0ZXudcl9VZM2UuzlUdxyVsg1oboX8MkGL/OfLgoR55oS751 G2oZNCSVDbsuOgPs93CcVBoZeO9LufbzxohLsi/LvPokl95/FnIqgNLpDY6nFuVxypGB1MzDI mIy+rSshxD8uRN26vb4dsDC4TI3sQ== Subject: [Buildroot] [PATCH v2 6/6] squashfs: add zstd support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Smirnov , "Yann E . MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - split off target zstd support (suggested by Yann E. MORIN) --- package/squashfs/Config.in | 6 ++++++ package/squashfs/squashfs.mk | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in index 70c0fc9808..c16ebbf27f 100644 --- a/package/squashfs/Config.in +++ b/package/squashfs/Config.in @@ -41,6 +41,12 @@ config BR2_PACKAGE_SQUASHFS_XZ help Support XZ compression algorithm +config BR2_PACKAGE_SQUASHFS_ZSTD + bool "zstd support" + select BR2_PACKAGE_ZSTD + help + Support ZSTD compression algorithm + endif comment "squashfs needs a toolchain w/ threads" diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk index 67025ac68a..bec867d676 100644 --- a/package/squashfs/squashfs.mk +++ b/package/squashfs/squashfs.mk @@ -9,7 +9,7 @@ SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git SQUASHFS_SITE_METHOD = git SQUASHFS_LICENSE = GPL-2.0+ SQUASHFS_LICENSE_FILES = COPYING -SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ZSTD_SUPPORT=0 +SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) SQUASHFS_DEPENDENCIES += lz4 @@ -46,6 +46,13 @@ else SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0 endif +ifeq ($(BR2_PACKAGE_SQUASHFS_ZSTD),y) +SQUASHFS_DEPENDENCIES += zstd +SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=1 COMP_DEFAULT=zstd +else +SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=0 +endif + HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz host-zstd HOST_SQUASHFS_MAKE_ARGS = \