Drop patch as issue fixed upstream. Signed-off-by: Alexander Kanavin <[email protected]> --- ...x-error-for-undeclared-macro-on-musl.patch | 28 ------------------- ...fs-tools_5.13.bb => btrfs-tools_5.13.1.bb} | 3 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-fix-error-for-undeclared-macro-on-musl.patch rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_5.13.bb => btrfs-tools_5.13.1.bb} (95%)
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 @@ -From a9802902d37b83c2c992cfe34179312f7209a962 Mon Sep 17 00:00:00 2001 -From: Wang Mingyu <[email protected]> -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 <[email protected]> ---- - 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.13.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.1.bb similarity index 95% rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.13.bb rename to 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" 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 = "de4914dbfd7e419d1c534b3d2ec8728e702114bf" +SRCREV = "e4ac7d4f67b330a3b27a4a50f73e94b1e072ae56" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#155083): https://lists.openembedded.org/g/openembedded-core/message/155083 Mute This Topic: https://lists.openembedded.org/mt/85060387/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
