From patchwork Tue Sep 6 13:59:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 666596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3sT7W84b1wz9vDp for ; Tue, 6 Sep 2016 23:59:16 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b=Lejm16uI; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 366F28993A; Tue, 6 Sep 2016 13:59:15 +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 U7TwAVKSpKWe; Tue, 6 Sep 2016 13:59:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0C90E8A291; Tue, 6 Sep 2016 13:59:13 +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 7B98F1C11D2 for ; Tue, 6 Sep 2016 13:59:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 77A7E888DD for ; Tue, 6 Sep 2016 13:59:12 +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 JK-ihE1O1sJT for ; Tue, 6 Sep 2016 13:59:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 72C1088749 for ; Tue, 6 Sep 2016 13:59:09 +0000 (UTC) Received: from asgard (cpe-190-55-196-87.telecentro-reversos.com.ar [190.55.196.87] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.2/8.15.2) with ESMTPSA id u86Dx2kx019907 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 6 Sep 2016 13:59:04 GMT DMARC-Filter: OpenDMARC Filter v1.3.1 www.zacarias.com.ar u86Dx2kx019907 Authentication-Results: zacarias.com.ar; dmarc=fail header.from=zacarias.com.ar Authentication-Results: zacarias.com.ar; spf=pass smtp.mailfrom=gustavo@zacarias.com.ar DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1473170346; bh=RZui77Lbt9XYge7t1RytZ9AAB7NFiIy1+W4ar3XIfy8=; h=From:To:Cc:Subject:Date; b=Lejm16uIMZTBdJJOwNu6sIFRpOaezEOQPjQ6ojHpTbki7XSbHelpwC13jdBjT770G xPrAugELcZmMyFW76TFueNRDo+KCU+CbhmQqp0JhOH3ghaCQyeO+d6KoTsX6YK9qKl uF+eMSo+idiheHvIOQGtfQlYXAhzAqUiV13BPOpM= Received: by asgard (sSMTP sendmail emulation); Tue, 06 Sep 2016 10:59:00 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 6 Sep 2016 10:59:00 -0300 Message-Id: <1473170340-9594-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.7.3 X-Virus-Scanned: clamav-milter 0.99 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] btrfs-progs: bump to version 4.7.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop all of the upstreamed patches (not precisely in the same form) and rebase the only required patch for proper static builds with staging libs required by other packages. Build-tested for arm-glibc, arm-uclibc, arm-musl and arm-uclibc-static. Signed-off-by: Gustavo Zacarias --- ...install-static-library-and-headers-in-in.patch} | 14 ++- ...01-configure-refactor-backtrace-detection.patch | 132 --------------------- ...onfigure-refactor-always_inline-detection.patch | 42 ------- ...compile-fix-undefined-PATH_MAX-under-musl.patch | 67 ----------- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 6 files changed, 10 insertions(+), 249 deletions(-) rename package/btrfs-progs/{0004-Makefile.in-install-static-library-and-headers-in-in.patch => 0001-Makefile.in-install-static-library-and-headers-in-in.patch} (76%) delete mode 100644 package/btrfs-progs/0001-configure-refactor-backtrace-detection.patch delete mode 100644 package/btrfs-progs/0002-configure-refactor-always_inline-detection.patch delete mode 100644 package/btrfs-progs/0003-compile-fix-undefined-PATH_MAX-under-musl.patch diff --git a/package/btrfs-progs/0004-Makefile.in-install-static-library-and-headers-in-in.patch b/package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch similarity index 76% rename from package/btrfs-progs/0004-Makefile.in-install-static-library-and-headers-in-in.patch rename to package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch index e6e9eab..d861dfc 100644 --- a/package/btrfs-progs/0004-Makefile.in-install-static-library-and-headers-in-in.patch +++ b/package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch @@ -12,15 +12,17 @@ should be installed by "install-static". Indeed, "make install" cannot be used if the support for shared library is not enabled. Signed-off-by: Thomas Petazzoni +[Gustavo: Rebase for btrfs-progs 4.7.2] +Signed-off-by: Gustavo Zacarias --- Makefile.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 8450ab3..0d3b490 100644 +index 19697ff..5870a58 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -183,7 +183,7 @@ test: test-fsck test-convert test-misc +@@ -219,7 +219,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz # NOTE: For static compiles, you need to have all the required libs # static equivalent available # @@ -29,10 +31,10 @@ index 8450ab3..0d3b490 100644 version.h: version.sh version.h.in configure.ac @echo " [SH] $@" -@@ -346,6 +346,10 @@ install-static: $(progs_static) $(INSTALLDIRS) - for p in $(progs_static) ; do \ - $(INSTALL) -D -m755 $$p $(DESTDIR)$(bindir)/`basename $$p .static` ; \ +@@ -384,6 +384,10 @@ install-static: $(progs_static) $(INSTALLDIRS) done + # btrfsck is a link to btrfs in the src tree, make it so for installed file as well + $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static + $(INSTALL) -m755 -d $(DESTDIR)$(libdir) + $(INSTALL) $(libs_static) $(DESTDIR)$(libdir) + $(INSTALL) -m755 -d $(DESTDIR)$(incdir) @@ -41,5 +43,5 @@ index 8450ab3..0d3b490 100644 $(INSTALLDIRS): @echo "Making install in $(patsubst install-%,%,$@)" -- -2.7.4 +2.7.3 diff --git a/package/btrfs-progs/0001-configure-refactor-backtrace-detection.patch b/package/btrfs-progs/0001-configure-refactor-backtrace-detection.patch deleted file mode 100644 index 0f834de..0000000 --- a/package/btrfs-progs/0001-configure-refactor-backtrace-detection.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 9bef473d17ec01efe760462271791dfaaea280c0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 29 Jul 2015 22:35:19 +0200 -Subject: [PATCH 1/3] configure: refactor backtrace() detection - -The current code assumes that if __GLIBC__ is not defined, backtrace -support is not available, and defines BTRFS_DISABLE_BACKTRACE. - -However, this macro is already defined by the configure.ac script when ---disable-backtrace is passed. This means that if you are using a C -library like musl which does not define __GLIBC__, and you pass ---disable-backtrace, you get a macro redefinition. - -Instead of relying on __GLIBC__, this commit implements a proper -configure.ac based detection of backtrace support: - - * If the user passes --enable-backtrace, we check if the backtrace() - function is available. If not, we abort the configure process with - an error. Otherwise we enable backtrace support by defining - HAVE_BACKTRACE. - - * If the user passes --disable-backtrace, then we don't enable - backtrace support. - - * If the user passes nothing special, we auto-detect: if backtrace() - is available, we use it, otherwise we simply warn at configure time - but not fail. - -Upstream-status: pending -Signed-off-by: Thomas Petazzoni -Signed-off-by: Brendan Heading ---- - configure.ac | 32 ++++++++++++++++++++++---------- - kerncompat.h | 9 ++++----- - 2 files changed, 26 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c3a22d1..e936a10 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,22 +63,34 @@ AC_DEFUN([PKG_STATIC], [ - fi - ]) - -- -+# Provide a --{enable,disable}-backtrace option. If not passed, set -+# enable_backtrace to 'auto' so that we try to enable backtrace -+# support if available, but if not available, we gracefully fallback -+# without backtrace support. - AC_ARG_ENABLE([backtrace], - AS_HELP_STRING([--disable-backtrace], [disable btrfs backtrace]), -- [], [enable_backtrace=yes] -+ [enable_backtrace=${enableval}], [enable_backtrace=auto] - ) - --AS_IF([test "x$enable_backtrace" = xno], [ -- AC_DEFINE([BTRFS_DISABLE_BACKTRACE], [1], [disable backtrace stuff in kerncompat.h ]) --]) -- --if test "x$enable_backtrace" = xyes; then -- AC_CHECK_HEADERS([execinfo.h]) -- AC_CHECK_FUNCS([backtrace backtrace_symbols_fd], [], -- AC_MSG_ERROR([standard library does not have backtrace support])) -+# Backtrace support requested (enable_backtrace is either 'yes' or -+# 'auto'), so check for needed headers and functions. -+if test "x$enable_backtrace" != xno; then -+ AC_CHECK_HEADERS([execinfo.h]) -+ AC_CHECK_FUNCS([backtrace backtrace_symbols_fd]) - fi - -+if test "x$ac_cv_func_backtrace" = xno; then -+ # If backtrace support was requested but not available, we fail if -+ # --enable-backtrace was passed, or we simply warn if we're -+ # auto-detecting. -+ if test "x$enable_backtrace" = xyes ; then -+ AC_MSG_ERROR([standard library does not have backtrace support]) -+ elif test "x$enable_backtrace" = xauto ; then -+ AC_MSG_WARN([standard library does not have backtrace support, disabled]) -+ fi -+else -+ AC_DEFINE([HAVE_BACKTRACE], [1], [Enable backtrace support]) -+fi - - AC_ARG_ENABLE([documentation], - AS_HELP_STRING([--disable-documentation], [do not build domumentation]), -diff --git a/kerncompat.h b/kerncompat.h -index 5d92856..8318665 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -33,11 +33,10 @@ - #include - - #ifndef __GLIBC__ --#define BTRFS_DISABLE_BACKTRACE - #define __always_inline __inline __attribute__ ((__always_inline__)) - #endif - --#ifndef BTRFS_DISABLE_BACKTRACE -+#ifdef HAVE_BACKTRACE - #include - #endif - -@@ -65,7 +64,7 @@ - #define ULONG_MAX (~0UL) - #endif - --#ifndef BTRFS_DISABLE_BACKTRACE -+#ifdef HAVE_BACKTRACE - #define MAX_BACKTRACE 16 - static inline void print_trace(void) - { -@@ -285,7 +284,7 @@ static inline long IS_ERR(const void *ptr) - #define vmalloc(x) malloc(x) - #define vfree(x) free(x) - --#ifndef BTRFS_DISABLE_BACKTRACE -+#ifdef HAVE_BACKTRACE - #define BUG_ON(c) assert_trace(#c, __FILE__, __func__, __LINE__, !(c)) - #else - #define BUG_ON(c) assert(!(c)) -@@ -293,7 +292,7 @@ static inline long IS_ERR(const void *ptr) - - #define WARN_ON(c) BUG_ON(c) - --#ifndef BTRFS_DISABLE_BACKTRACE -+#ifdef HAVE_BACKTRACE - #define ASSERT(c) assert_trace(#c, __FILE__, __func__, __LINE__, (c)) - #else - #define ASSERT(c) assert(c) --- -2.4.3 - diff --git a/package/btrfs-progs/0002-configure-refactor-always_inline-detection.patch b/package/btrfs-progs/0002-configure-refactor-always_inline-detection.patch deleted file mode 100644 index f54d250..0000000 --- a/package/btrfs-progs/0002-configure-refactor-always_inline-detection.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1d99ae25bb1bd4879c6f20f607faf3040018ee84 Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Thu, 30 Jul 2015 15:44:52 +0100 -Subject: [PATCH 2/3] configure: refactor always_inline detection - -Use configure.ac to detect the availability of the always_inline glibc -macro, and define it only if it does not exist. - -Signed-off-by: Brendan Heading ---- - configure.ac | 1 + - kerncompat.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e936a10..d3d81a1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,6 +41,7 @@ AC_PATH_PROG([RMDIR], [rmdir], [rmdir]) - - AC_CHECK_FUNCS([openat], [], - [AC_MSG_ERROR([cannot find openat() function])]) -+AC_CHECK_DECLS([__always_inline]) - - m4_ifndef([PKG_PROG_PKG_CONFIG], - [m4_fatal([Could not locate the pkg-config autoconf -diff --git a/kerncompat.h b/kerncompat.h -index 8318665..757b9b4 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -32,7 +32,7 @@ - - #include - --#ifndef __GLIBC__ -+#ifndef HAVE_DECL___ALWAYS_INLINE - #define __always_inline __inline __attribute__ ((__always_inline__)) - #endif - --- -2.4.3 - diff --git a/package/btrfs-progs/0003-compile-fix-undefined-PATH_MAX-under-musl.patch b/package/btrfs-progs/0003-compile-fix-undefined-PATH_MAX-under-musl.patch deleted file mode 100644 index 3526014..0000000 --- a/package/btrfs-progs/0003-compile-fix-undefined-PATH_MAX-under-musl.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 3197a4b058615d81aa4623fb5a52e57d7fbc3af2 Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Thu, 30 Jul 2015 15:47:16 +0100 -Subject: [PATCH 3/3] compile: fix undefined PATH_MAX under musl - -musl's strict implementation requires #include for PATH_MAX. - -Upstream-status: submitted -Signed-off-by: Brendan Heading ---- - cmds-inspect.c | 1 + - cmds-receive.c | 1 + - cmds-scrub.c | 1 + - cmds-send.c | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/cmds-inspect.c b/cmds-inspect.c -index 71451fe..9712581 100644 ---- a/cmds-inspect.c -+++ b/cmds-inspect.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "kerncompat.h" - #include "ioctl.h" -diff --git a/cmds-receive.c b/cmds-receive.c -index 071bea9..d4b3103 100644 ---- a/cmds-receive.c -+++ b/cmds-receive.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/cmds-scrub.c b/cmds-scrub.c -index b7aa809..5a85dc4 100644 ---- a/cmds-scrub.c -+++ b/cmds-scrub.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "ctree.h" - #include "ioctl.h" -diff --git a/cmds-send.c b/cmds-send.c -index 20bba18..a0b7f95 100644 ---- a/cmds-send.c -+++ b/cmds-send.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - #include "ctree.h" - #include "ioctl.h" --- -2.4.3 - diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 799c878..4cd00aa 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 62db60c6a0868afb6302112cea54c756873bc30b826696b167ec03ecd61b2f12 btrfs-progs-v4.1.2.tar.xz +sha256 f49bc9e143ffe60260c5bd70ef3b624576673f8b50f41e309892a425f7fbe60f btrfs-progs-v4.7.2.tar.xz diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 8768057..e094986 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.1.2 +BTRFS_PROGS_VERSION = 4.7.2 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