mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
systemd: update to 251.4
log: - https://github.com/systemd/systemd-stable/compare/v251.3...v251.4
This commit is contained in:
parent
67dac15b15
commit
7e5db84cb4
@ -3,8 +3,8 @@
|
|||||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="systemd"
|
PKG_NAME="systemd"
|
||||||
PKG_VERSION="251.3"
|
PKG_VERSION="251.4"
|
||||||
PKG_SHA256="11c9c3fcc13d689615dd2ea79161d1b992087cf1e2a23856d7d7ade0efbddc54"
|
PKG_SHA256="3459239979f52b8c4ace33734d31c2fb69fa13cf81d04b1b982f7d8d4651e015"
|
||||||
PKG_LICENSE="LGPL2.1+"
|
PKG_LICENSE="LGPL2.1+"
|
||||||
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
|
PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
|
||||||
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"
|
PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"
|
||||||
|
@ -1,93 +0,0 @@
|
|||||||
From 21c03ad5e9d8d0350e30dae92a5e15da318a1539 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Rudi Heitbaum <rudi@heitbaum.com>
|
|
||||||
Date: Sat, 23 Jul 2022 10:38:49 +0000
|
|
||||||
Subject: [PATCH] glibc: Remove #include <linux/fs.h> to resolve
|
|
||||||
fsconfig_command/mount_attr conflict with glibc 2.36
|
|
||||||
|
|
||||||
---
|
|
||||||
meson.build | 13 ++++++++++++-
|
|
||||||
src/basic/fd-util.c | 2 ++
|
|
||||||
src/core/namespace.c | 2 ++
|
|
||||||
src/shared/mount-util.c | 2 ++
|
|
||||||
4 files changed, 18 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 5d7c8699fe0d..88fe3f5d497e 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -506,7 +506,6 @@ decl_headers = '''
|
|
||||||
#include <uchar.h>
|
|
||||||
#include <sys/mount.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
-#include <linux/fs.h>
|
|
||||||
'''
|
|
||||||
|
|
||||||
foreach decl : ['char16_t',
|
|
||||||
@@ -518,6 +517,17 @@ foreach decl : ['char16_t',
|
|
||||||
# We get -1 if the size cannot be determined
|
|
||||||
have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0
|
|
||||||
|
|
||||||
+ if decl == 'struct mount_attr'
|
|
||||||
+ if have
|
|
||||||
+ want_linux_fs_h = false
|
|
||||||
+ else
|
|
||||||
+ have = cc.sizeof(decl,
|
|
||||||
+ prefix : decl_headers + '#include <linux/fs.h>',
|
|
||||||
+ args : '-D_GNU_SOURCE') > 0
|
|
||||||
+ want_linux_fs_h = have
|
|
||||||
+ endif
|
|
||||||
+ endif
|
|
||||||
+
|
|
||||||
if decl == 'struct statx'
|
|
||||||
if have
|
|
||||||
want_linux_stat_h = false
|
|
||||||
@@ -533,6 +543,7 @@ foreach decl : ['char16_t',
|
|
||||||
endforeach
|
|
||||||
|
|
||||||
conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h)
|
|
||||||
+conf.set10('WANT_LINUX_FS_H', want_linux_fs_h)
|
|
||||||
|
|
||||||
foreach ident : ['secure_getenv', '__secure_getenv']
|
|
||||||
conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident))
|
|
||||||
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
|
|
||||||
index 6c1de92a26ca..00591d6c2d31 100644
|
|
||||||
--- a/src/basic/fd-util.c
|
|
||||||
+++ b/src/basic/fd-util.c
|
|
||||||
@@ -3,7 +3,9 @@
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <linux/btrfs.h>
|
|
||||||
+#if WANT_LINUX_FS_H
|
|
||||||
#include <linux/fs.h>
|
|
||||||
+#endif
|
|
||||||
#include <linux/magic.h>
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <sys/resource.h>
|
|
||||||
diff --git a/src/core/namespace.c b/src/core/namespace.c
|
|
||||||
index 41457ea81647..016afe4d9e90 100644
|
|
||||||
--- a/src/core/namespace.c
|
|
||||||
+++ b/src/core/namespace.c
|
|
||||||
@@ -7,7 +7,9 @@
|
|
||||||
#include <sys/file.h>
|
|
||||||
#include <sys/mount.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
+#if WANT_LINUX_FS_H
|
|
||||||
#include <linux/fs.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include "alloc-util.h"
|
|
||||||
#include "base-filesystem.h"
|
|
||||||
diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
|
|
||||||
index 8cf16affcb8f..a119a7c3c1b2 100644
|
|
||||||
--- a/src/shared/mount-util.c
|
|
||||||
+++ b/src/shared/mount-util.c
|
|
||||||
@@ -7,7 +7,9 @@
|
|
||||||
#include <sys/statvfs.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <linux/loop.h>
|
|
||||||
+#if WANT_LINUX_FS_H
|
|
||||||
#include <linux/fs.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include "alloc-util.h"
|
|
||||||
#include "chase-symlinks.h"
|
|
Loading…
x
Reference in New Issue
Block a user