mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
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>
This commit is contained in:
parent
fafe2128c6
commit
609b059b01
|
@ -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
|
|
||||||
|
|
|
@ -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 \
|
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-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"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
PACKAGECONFIG ??= " \
|
PACKAGECONFIG ??= " \
|
Loading…
Reference in New Issue
Block a user