Merge pull request #7517 from heitbaum/systemd

systemd: update to 252.6
This commit is contained in:
CvH 2023-02-19 12:24:22 +01:00 committed by GitHub
commit eb86119f44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 22 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="systemd"
PKG_VERSION="252.5"
PKG_SHA256="cc57a54a323d9f813f59eb4d79c2e2ea987e27c9b5ad2079eb9d2756567d53ee"
PKG_VERSION="252.6"
PKG_SHA256="5f0b391f7e481f9ce0798515f34e85963990d42a27f9f80fc9e7321610b69784"
PKG_LICENSE="LGPL2.1+"
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"

View File

@ -1,20 +0,0 @@
commit 134db60f65ecea9a5c6536541a74a6ff5e4167de
Author: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue Jan 31 12:06:56 2023 +0000
glibc: Conditionally #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
diff --git a/src/basic/linux/btrfs.h b/src/basic/linux/btrfs.h
index 0a53bdc38a..74ed9088bd 100644
--- a/src/basic/linux/btrfs.h
+++ b/src/basic/linux/btrfs.h
@@ -26,7 +26,9 @@ extern "C" {
#include <linux/types.h>
#include <linux/ioctl.h>
+#if WANT_LINUX_FS_H
#include <linux/fs.h>
+#endif
#define BTRFS_IOCTL_MAGIC 0x94
#define BTRFS_VOL_NAME_MAX 255