From patchwork Fri Mar 9 07:12:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 883496 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tkos.co.il Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zyJVC3YLXz9sfg for ; Fri, 9 Mar 2018 18:12:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2A31022799; Fri, 9 Mar 2018 07:12:16 +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 fy0Z1JL7+Vcf; Fri, 9 Mar 2018 07:12:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 39BD3226D3; Fri, 9 Mar 2018 07:12:15 +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 7906C1BFDBA for ; Fri, 9 Mar 2018 07:12:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 75F7D88CBE for ; Fri, 9 Mar 2018 07:12:14 +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 vgE50jzrjpUi for ; Fri, 9 Mar 2018 07:12:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5FFBE88B26 for ; Fri, 9 Mar 2018 07:12:12 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 76DBA4402B5; Fri, 9 Mar 2018 09:12:10 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Fri, 9 Mar 2018 09:12:00 +0200 Message-Id: <523c80cff000a6c35a19922e22239e0490ce6a85.1520579520.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.16.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] btrfs-progs: bump to version 4.15.1 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Disable libzstd support explicitly to avoid configure failure. The Buildroot zstd package does not currently install its library. Drop upstream patch. Signed-off-by: Baruch Siach --- ...fs-progs-convert-add-missing-types-header.patch | 39 ---------------------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 4 +-- 3 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch diff --git a/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch b/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch deleted file mode 100644 index 7b09f2785c20..000000000000 --- a/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch +++ /dev/null @@ -1,39 +0,0 @@ -From dda485a3d788c47bb6849218f695db7b51822872 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 31 Oct 2017 14:51:51 +0200 -Subject: [PATCH] btrfs-progs: convert: add missing types header - -Build with musl libc needs the sys/types.h header for the dev_t type, -since this header is not included indirectly. This fixes the following -build failure: - -In file included from convert/source-fs.c:23:0: -./convert/source-fs.h:112:1: error: unknown type name ‘dev_t’ - dev_t decode_dev(u32 dev); - ^~~~~ -convert/source-fs.c:31:1: error: unknown type name ‘dev_t’ - dev_t decode_dev(u32 dev) - ^~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: https://marc.info/?l=linux-btrfs&m=150945479718731&w=2 - - convert/source-fs.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/convert/source-fs.h b/convert/source-fs.h -index 23f33567b42d..4e5babefe6a2 100644 ---- a/convert/source-fs.h -+++ b/convert/source-fs.h -@@ -19,6 +19,7 @@ - - #include "kerncompat.h" - #include -+#include - #include - - #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID --- -2.14.2 - diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index bdcb8bada19e..54d34c919156 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783 btrfs-progs-v4.13.3.tar.xz +sha256 67102ac0d6795f368acc94efaca29b6626d972638790a4a0c9f89a27cd543f96 btrfs-progs-v4.15.1.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 96c4350d26db..776a3ef84154 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,11 +4,11 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.13.3 +BTRFS_PROGS_VERSION = 4.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib -BTRFS_PROGS_CONF_OPTS = --disable-backtrace +BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd BTRFS_PROGS_LICENSE = GPL-2.0 BTRFS_PROGS_LICENSE_FILES = COPYING BTRFS_PROGS_INSTALL_STAGING = YES