summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-08-22 14:50:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-23 08:25:52 +0100
commit3570e4040c03a44ef030c02593daab40d8d32531 (patch)
treebb1232f4e25399058b26b0d99d883e041e9d22d9 /meta/recipes-devtools/btrfs-tools
parentb3d1265f3617d32a5feb53c40481149e81b7ec7b (diff)
downloadpoky-3570e4040c03a44ef030c02593daab40d8d32531.tar.gz
btrfs-tools: update 5.13 -> 5.13.1
Drop patch as issue fixed upstream. (From OE-Core rev: f5ff6ae84dbb11a4f3cfff463b7bc5b0a8046048) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch28
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb)3
2 files changed, 1 insertions, 30 deletions
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
deleted file mode 100644
index 251f5d2b0e..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From a9802902d37b83c2c992cfe34179312f7209a962 Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@fujitsu.com>
3Date: Mon, 19 Jul 2021 10:12:12 +0900
4Subject: [PATCH] fix error for undeclared macro on musl
5
6Fixes the following compilation errors with musl that does not have
7NAME_MAX declared:
8'NAME_MAX' undeclared (first use in this function)
9
10Upstream-Status: Pending
11
12Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
13---
14 cmds/filesystem-usage.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/cmds/filesystem-usage.c b/cmds/filesystem-usage.c
18index 50d8995e..856e9d7b 100644
19--- a/cmds/filesystem-usage.c
20+++ b/cmds/filesystem-usage.c
21@@ -24,6 +24,7 @@
22 #include <stdarg.h>
23 #include <getopt.h>
24 #include <fcntl.h>
25+#include <limits.h>
26
27 #include "common/utils.h"
28 #include "kerncompat.h"
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb
index 5f8621faf1..5288978943 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb
@@ -19,9 +19,8 @@ DEPENDS:append:class-target = " udev"
19SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \ 19SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
20 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ 20 file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
21 file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \ 21 file://0001-btrfs-tools-include-linux-const.h-to-fix-build-with-.patch \
22 file://0001-fix-error-for-undeclared-macro-on-musl.patch \
23 " 22 "
24SRCREV = "de4914dbfd7e419d1c534b3d2ec8728e702114bf" 23SRCREV = "e4ac7d4f67b330a3b27a4a50f73e94b1e072ae56"
25S = "${WORKDIR}/git" 24S = "${WORKDIR}/git"
26 25
27PACKAGECONFIG ??= " \ 26PACKAGECONFIG ??= " \