Merge pull request #6835 from heitbaum/btrfs

[le11] btrfs-progs: update to 5.19 and addon to (109)

packages/addons/tools/btrfs-progs/changelog.txt

@@ -1,3 +1,6 @@
+109
+- update to 5.19
+
 108
 - update to 5.18.1
 

packages/addons/tools/btrfs-progs/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="btrfs-progs"
-PKG_VERSION="5.18.1"
+PKG_VERSION="5.19"
-PKG_SHA256="8a8ad6bc2b5ccd870fa2b18a822ef354222c8d06b1ca98bf81d9da68bd9df2b3"
+PKG_SHA256="4454483dae038efabe1251eb395d195ab6f1e91e1d722d1f99eb3b9e2c4b2c4a"
-PKG_REV="108"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://btrfs.wiki.kernel.org/index.php/Main_Page"

packages/addons/tools/btrfs-progs/patches/btrfs-progs-01-compile-with-glibc-2.36.patch

@@ -1,32 +0,0 @@
-From 46eb32a019834b0a49ae9744db1a921aaa6a3d63 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jul 2022 11:58:35 -0700
-Subject: [PATCH] btrfs-progs: use linux mount.h instead of sys/mount.h
-
-This file includes linux/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
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: David Sterba <dsterba@suse.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>
--- 
-GitLab
-