From: wangmy <wangmy@fujitsu.com>
Date: Mon, 19 Jul 2021 08:59:28 +0000 (+0800)
Subject: btrfs-tools: upgrade 5.12.1 -> 5.13
X-Git-Tag: uninative-3.3~208
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fd8989db25c674ca65389a2d41bf5b447e8794be;p=openembedded-core.git

btrfs-tools: upgrade 5.12.1 -> 5.13

    Add patch to fix bug for undeclared macro on musl.

    btrfs-progs-5.13 (2021-07-13)
    * restore: remove loop checks for extent count and directory scan
    * inspect dump-tree: new options to print node (--csum-headers) and data
      checksums (--csum-items)
    * fi usage:
      * print stripe count for striped profiles
      * print zoned information: size, total unusable
    * mkfs: print note about sha256 accelerated module loading issue
    * check: ability to reset dev_item::bytes_used
    * fixes
      * detect zoned kernel support at run time too
      * exclusive op running check return value
    * fi resize: support cancel (kernel 5.14)
    * device remove: support cancel (kernel 5.14)
    * documentation about general topics
      * compression
      * zoned mode
      * storage model
      * hardware considerations
    * other
      * libbtrfsutil API overview
      * help text fixes and updates
      * hash speedtest measure time, cycles using perf and print throughput

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch
new file mode 100644
index 0000000000..251f5d2b0e
--- /dev/null
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch
@@ -0,0 +1,28 @@
+From a9802902d37b83c2c992cfe34179312f7209a962 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <wangmy@fujitsu.com>
+Date: Mon, 19 Jul 2021 10:12:12 +0900
+Subject: [PATCH] fix error for undeclared macro on musl 
+
+Fixes the following compilation errors with musl that does not have
+NAME_MAX declared:
+'NAME_MAX' undeclared (first use in this function)
+
+Upstream-Status: Pending
+
+Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
+---
+ cmds/filesystem-usage.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
+index 50d8995e..856e9d7b 100644
+--- a/cmds/filesystem-usage.c
++++ b/cmds/filesystem-usage.c
+@@ -24,6 +24,7 @@
+ #include <stdarg.h>
+ #include <getopt.h>
+ #include <fcntl.h>
++#include <limits.h>
+ 
+ #include "common/utils.h"
+ #include "kerncompat.h"
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb
similarity index 95%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb
index d0c9cf2a99..fa33cad7b9 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.12.1.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb
@@ -19,8 +19,9 @@ DEPENDS_append_class-target = " udev"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
+           file://0001-fix-error-for-undeclared-macro-on-musl.patch \
            "
-SRCREV = "96d77fcefdd3b9fd297b5aabbce6dc43e2315ee2"
+SRCREV = "de4914dbfd7e419d1c534b3d2ec8728e702114bf"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \