diff options
| author |   wangmy <wangmy@fujitsu.com> | 2022-08-24 16:46:14 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-25 11:07:33 +0100 |
| commit | 53ead3fb0e51e71207dfd62f43f0ec4304524dcc (patch) | |
| tree | 1e3186ad89293260be89145e03735543625dcbd1 /meta/recipes-devtools/btrfs-tools | |
| parent | f7061fc14cbc4388b1fd0cf6233b1a2e743e20e5 (diff) | |
| download | openembedded-core-53ead3fb0e51e71207dfd62f43f0ec4304524dcc.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
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')
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools_5.19.bb (renamed from meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.1.bb) | 3 |
2 files changed, 1 insertions, 34 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 @@ -From d9f118a3408a8a2530f0f60e8072f4323911530f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 27 Jul 2022 01:08:20 +0000 -Subject: [PATCH] device-utils.c: Use linux mount.h instead of sys/mount.h - -This file includes linucx/fs.h which includes linux/mount.h and with -glibc 2.36 linux/mount.h and glibc mount.h are not compatible [1] -therefore try to avoid including both headers - -[1] https://sourceware.org/glibc/wiki/Release/2.36 - -Upstream-Status: Submitted [https://www.spinics.net/lists/linux-btrfs/msg126918.html] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - common/device-utils.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/common/device-utils.c b/common/device-utils.c -index 617b6746..25a4fb8c 100644 ---- a/common/device-utils.c -+++ b/common/device-utils.c -@@ -15,7 +15,6 @@ - */ - - #include <sys/ioctl.h> --#include <sys/mount.h> - #include <sys/statfs.h> - #include <sys/types.h> - #include <stdio.h> --- -2.25.1 - diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.1.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.19.bb index 5b24bef5cd..4f116a85ac 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.18.1.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_5.19.bb @@ -17,9 +17,8 @@ DEPENDS = "util-linux zlib" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;branch=master \ file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \ - file://0001-device-utils.c-Use-linux-mount.h-instead-of-sys-moun.patch \ " -SRCREV = "47b5cf867fc37411ef51eb5c09893a95f7f6c3b7" +SRCREV = "96b83b16158f3b87037085761bf212e958473767" S = "${WORKDIR}/git" PACKAGECONFIG ??= " \ |