summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch43
1 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch b/meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch
deleted file mode 100644
index 9376a8f750..0000000000
--- a/meta/recipes-core/systemd/systemd/0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From a0b1496322f4d7ce83f4fbfd2a90b91d0721f643 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 24 Oct 2017 23:08:24 -0700
4Subject: [PATCH 25/31] Define _PATH_WTMPX and _PATH_UTMPX if not defined
5
6Musl needs these defines
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 src/shared/utmp-wtmp.c | 8 ++++++++
13 1 file changed, 8 insertions(+)
14
15diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
16index cab1cd6a2..f5eedac18 100644
17--- a/src/shared/utmp-wtmp.c
18+++ b/src/shared/utmp-wtmp.c
19@@ -28,6 +28,7 @@
20 #include <sys/time.h>
21 #include <sys/utsname.h>
22 #include <unistd.h>
23+#include <utmp.h>
24 #include <utmpx.h>
25
26 #include "alloc-util.h"
27@@ -42,6 +43,13 @@
28 #include "util.h"
29 #include "utmp-wtmp.h"
30
31+#if defined _PATH_UTMP && !defined _PATH_UTMPX
32+# define _PATH_UTMPX _PATH_UTMP
33+#endif
34+#if defined _PATH_WTMP && !defined _PATH_WTMPX
35+# define _PATH_WTMPX _PATH_WTMP
36+#endif
37+
38 int utmp_get_runlevel(int *runlevel, int *previous) {
39 struct utmpx *found, lookup = { .ut_type = RUN_LVL };
40 int r;
41--
422.13.0
43