diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-26 12:02:50 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-29 08:28:52 +0000 |
commit | 485b4a0e7a95a2ca0ff21637d073ee510468b9de (patch) | |
tree | 57ae8f013c731454fda3261410506eb4bff12f75 /meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch | |
parent | 6d591d2ce9c95db9cad2a8e91ba074fee9c4d553 (diff) | |
download | poky-485b4a0e7a95a2ca0ff21637d073ee510468b9de.tar.gz |
sysvinit: consolidate patches
(From OE-Core rev: b89a48da4bc25c769f8dbc15d5e8596258cda472)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch')
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch b/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch new file mode 100644 index 0000000000..2575b59b5e --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch | |||
@@ -0,0 +1,71 @@ | |||
1 | From 29c7a529d3bb0c1e20239f885e74c5036f1a908c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 6 Aug 2018 15:38:58 -0700 | ||
4 | Subject: [PATCH] include sys/sysmacros.h for major/minor defines in glibc | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Upstream-Status: Pending | ||
8 | --- | ||
9 | src/bootlogd.c | 3 +++ | ||
10 | src/bootlogd.o | Bin 58448 -> 60376 bytes | ||
11 | src/dowall.c | 3 +++ | ||
12 | src/shutdown.c | 4 +++- | ||
13 | 4 files changed, 9 insertions(+), 1 deletion(-) | ||
14 | |||
15 | Index: sysvinit-2.88dsf/src/bootlogd.c | ||
16 | =================================================================== | ||
17 | --- sysvinit-2.88dsf.orig/src/bootlogd.c | ||
18 | +++ sysvinit-2.88dsf/src/bootlogd.c | ||
19 | @@ -53,6 +53,9 @@ | ||
20 | #ifdef __linux__ | ||
21 | #include <sys/mount.h> | ||
22 | #endif | ||
23 | +#ifdef __GLIBC__ | ||
24 | +#include <sys/sysmacros.h> | ||
25 | +#endif | ||
26 | |||
27 | char *Version = "@(#) bootlogd 2.86 03-Jun-2004 miquels@cistron.nl"; | ||
28 | |||
29 | Index: sysvinit-2.88dsf/src/dowall.c | ||
30 | =================================================================== | ||
31 | --- sysvinit-2.88dsf.orig/src/dowall.c | ||
32 | +++ sysvinit-2.88dsf/src/dowall.c | ||
33 | @@ -37,6 +37,9 @@ | ||
34 | #include <signal.h> | ||
35 | #include <setjmp.h> | ||
36 | #include <paths.h> | ||
37 | +#ifdef __GLIBC__ | ||
38 | +#include <sys/sysmacros.h> | ||
39 | +#endif | ||
40 | |||
41 | #ifndef _PATH_DEV | ||
42 | # define _PATH_DEV "/dev/" | ||
43 | Index: sysvinit-2.88dsf/src/shutdown.c | ||
44 | =================================================================== | ||
45 | --- sysvinit-2.88dsf.orig/src/shutdown.c | ||
46 | +++ sysvinit-2.88dsf/src/shutdown.c | ||
47 | @@ -57,7 +57,9 @@ | ||
48 | #include "reboot.h" | ||
49 | #include "initreq.h" | ||
50 | #include "init.h" | ||
51 | - | ||
52 | +#ifdef __GLIBC__ | ||
53 | +#include <sys/sysmacros.h> | ||
54 | +#endif | ||
55 | |||
56 | char *Version = "@(#) shutdown 2.86-1 31-Jul-2004 miquels@cistron.nl"; | ||
57 | |||
58 | Index: sysvinit-2.88dsf/src/mountpoint.c | ||
59 | =================================================================== | ||
60 | --- sysvinit-2.88dsf.orig/src/mountpoint.c | ||
61 | +++ sysvinit-2.88dsf/src/mountpoint.c | ||
62 | @@ -32,6 +32,9 @@ | ||
63 | #include <stdarg.h> | ||
64 | #include <getopt.h> | ||
65 | #include <stdio.h> | ||
66 | +#ifdef __GLIBC__ | ||
67 | +#include <sys/sysmacros.h> | ||
68 | +#endif | ||
69 | |||
70 | int dostat(char *path, struct stat *st, int do_lstat, int quiet) | ||
71 | { | ||