summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/btrfs-tools/btrfs-tools
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-08-24 16:46:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-25 11:08:06 +0100
commit609b059b0152c4663db3dc738d619f302783f200 (patch)
tree85b3050b391b3db82447aa45dd7f04a7efc6b59b /meta/recipes-devtools/btrfs-tools/btrfs-tools
parentfafe2128c624aade6b3855b9cb33b887f5e606d8 (diff)
downloadpoky-609b059b0152c4663db3dc738d619f302783f200.tar.gz
btrfs-tools: upgrade 5.18.1 -> 5.19
0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch removed since it's included in 5.19 Changelog: ========== * send: support protocol version 2 * fi show: print all missing devices * device stats: add tabular output * replace: add alias to device group (device replace) * check: validate free space tree items * fixes: * convert: support large filesystems (block count > 32bit) * recognize filesystems with verity enabled * mkfs and DUP could write out of order, fix it for zoned mode * build: * optional support for LZO and ZSTD in receive * compatibility with glibc 2.36 (mount.h) * add fallbacks for new GCC builtins * other: * corrupt-block: target specific items, offsets * documentation updates, new pages from wiki * new tests (From OE-Core rev: 53ead3fb0e51e71207dfd62f43f0ec4304524dcc) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools')
-rw-r--r--meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch
deleted file mode 100644
index 1397e50b30..0000000000
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From d9f118a3408a8a2530f0f60e8072f4323911530f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 27 Jul 2022 01:08:20 +0000
4Subject: [PATCH] device-utils.c: Use linux mount.h instead of sys/mount.h
5
6This file includes linucx/fs.h which includes linux/mount.h and with
7glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1]
8therefore try to avoid including both headers
9
10[1] https://sourceware.org/glibc/wiki/Release/2.36
11
12Upstream-Status: Submitted [https://www.spinics.net/lists/linux-btrfs/msg126918.html]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 common/device-utils.c | 1 -
16 1 file changed, 1 deletion(-)
17
18diff --git a/common/device-utils.c b/common/device-utils.c
19index 617b6746..25a4fb8c 100644
20--- a/common/device-utils.c
21+++ b/common/device-utils.c
22@@ -15,7 +15,6 @@
23 */
24
25 #include <sys/ioctl.h>
26-#include <sys/mount.h>
27 #include <sys/statfs.h>
28 #include <sys/types.h>
29 #include <stdio.h>
30--
312.25.1
32