summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-08-08 10:04:25 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 09:44:33 +0100
commit650cc7003e8f85f4e613fde127fd8bfd0fcdf944 (patch)
treef61e568ca1553a41860bf36d280ea53af49036c5 /meta
parent562210c8a09967e1573107fea12e0bd2cca5501b (diff)
downloadpoky-650cc7003e8f85f4e613fde127fd8bfd0fcdf944.tar.gz
sysvinit: Fix build with glibc 2.28 + libxcrypt
(From OE-Core rev: 87f2683ca19182dbffe48dc70a1f2628658fc08d) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/sysvinit/sysvinit-2.88dsf/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch71
-rw-r--r--meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb3
2 files changed, 73 insertions, 1 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit-2.88dsf/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch b/meta/recipes-core/sysvinit/sysvinit-2.88dsf/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-2.88dsf/0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch
@@ -0,0 +1,71 @@
1From 29c7a529d3bb0c1e20239f885e74c5036f1a908c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Aug 2018 15:38:58 -0700
4Subject: [PATCH] include sys/sysmacros.h for major/minor defines in glibc
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-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
15Index: 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
29Index: 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/"
43Index: 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
58Index: 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 {
diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index ad65819b2d..a21e7e46f7 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -15,6 +15,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.bz2 \
15 file://pidof-add-m-option.patch \ 15 file://pidof-add-m-option.patch \
16 file://0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch \ 16 file://0001-This-fixes-an-issue-that-clang-reports-about-mutlipl.patch \
17 file://realpath.patch \ 17 file://realpath.patch \
18 file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \
18 file://rcS-default \ 19 file://rcS-default \
19 file://rc \ 20 file://rc \
20 file://rcS \ 21 file://rcS \
@@ -29,7 +30,7 @@ S = "${WORKDIR}/sysvinit-${PV}"
29B = "${S}/src" 30B = "${S}/src"
30 31
31inherit update-alternatives distro_features_check 32inherit update-alternatives distro_features_check
32DEPENDS_append = " update-rc.d-native base-passwd" 33DEPENDS_append = " update-rc.d-native base-passwd virtual/crypt"
33 34
34REQUIRED_DISTRO_FEATURES = "sysvinit" 35REQUIRED_DISTRO_FEATURES = "sysvinit"
35 36