summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-01-27 12:03:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-30 11:50:11 +0000
commit2c09f9722a6f44651534770117b91ad0d89c0a43 (patch)
tree9f974feb1c8f6a75808d340476bea10af7b482fa /meta
parentc58d9a98d40a7f3ed01ef4589f128917948e74d4 (diff)
downloadpoky-2c09f9722a6f44651534770117b91ad0d89c0a43.tar.gz
systemd: Fix build with glibc 2.27
(From OE-Core rev: cf4fc7804f093f5b570eaeaa39cb5dce5db1e379) 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/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch7
-rw-r--r--meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch28
-rw-r--r--meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch27
-rw-r--r--meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch26
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb3
5 files changed, 87 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
index 7f1bc447fe..b7b1ea0886 100644
--- a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
+++ b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
@@ -1,8 +1,7 @@
1From f1b5a6f717bda6f80a6b5e3e4d50b450f6cc7b09 Mon Sep 17 00:00:00 2001 1From 9820c165a9e559cf851e3beb60fad2571de4ded2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 14 Dec 2015 04:09:19 +0000 3Date: Mon, 14 Dec 2015 04:09:19 +0000
4Subject: [PATCH 14/14] core/device.c: Change the default device timeout to 240 4Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec.
5 sec.
6MIME-Version: 1.0 5MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -30,5 +29,5 @@ index 77601c552..98bf49ba2 100644
30 u->ignore_on_isolate = true; 29 u->ignore_on_isolate = true;
31 } 30 }
32-- 31--
332.13.2 322.16.1
34 33
diff --git a/meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch b/meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
new file mode 100644
index 0000000000..c6431209d0
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-meson-update-header-file-to-detect-memfd_create.patch
@@ -0,0 +1,28 @@
1From 2207e1ffe4f7e2dcc5e745dadb48738aa1048d63 Mon Sep 17 00:00:00 2001
2From: Yu Watanabe <watanabe.yu+github@gmail.com>
3Date: Sun, 26 Nov 2017 02:17:06 +0900
4Subject: [PATCH 1/3] meson: update header file to detect memfd_create()
5
6---
7Upstream-Status: Backport
8
9 meson.build | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12diff --git a/meson.build b/meson.build
13index 20b27c860..550dd4ad8 100644
14--- a/meson.build
15+++ b/meson.build
16@@ -414,7 +414,8 @@ foreach ident : ['secure_getenv', '__secure_getenv']
17 endforeach
18
19 foreach ident : [
20- ['memfd_create', '''#include <sys/memfd.h>'''],
21+ ['memfd_create', '''#define _GNU_SOURCE
22+ #include <sys/mman.h>'''],
23 ['gettid', '''#include <sys/types.h>'''],
24 ['pivot_root', '''#include <stdlib.h>'''], # no known header declares pivot_root
25 ['name_to_handle_at', '''#define _GNU_SOURCE
26--
272.16.1
28
diff --git a/meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch b/meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
new file mode 100644
index 0000000000..da798a79a3
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0002-configure.ac-Check-if-memfd_create-is-already-define.patch
@@ -0,0 +1,27 @@
1From 025408c87869962f511de044dd41a1f4b1d80165 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 27 Jan 2018 11:53:38 -0800
4Subject: [PATCH 2/3] configure.ac: Check if memfd_create is already defined
5
6Upstream-Status: Inappropriate [upstream systemd uses meson]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 configure.ac | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/configure.ac b/configure.ac
14index 3674190fb..c7a184d72 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -340,6 +340,7 @@ AC_CHECK_DECLS([
18 [], [], [[
19 #include <sys/types.h>
20 #include <unistd.h>
21+#include <sys/mman.h>
22 #include <sys/mount.h>
23 #include <fcntl.h>
24 #include <sched.h>
25--
262.16.1
27
diff --git a/meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch b/meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
new file mode 100644
index 0000000000..c466d0d87b
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0003-fileio-include-sys-mman.h.patch
@@ -0,0 +1,26 @@
1From 52e922343faaa87b9efb8aa9ea578399ccc9bec9 Mon Sep 17 00:00:00 2001
2From: Yu Watanabe <watanabe.yu+github@gmail.com>
3Date: Sun, 26 Nov 2017 02:40:23 +0900
4Subject: [PATCH 3/3] fileio: include sys/mman.h
5
6---
7Upstream-Status: Backport
8
9 src/basic/fileio.c | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/src/basic/fileio.c b/src/basic/fileio.c
13index 9a185e3e6..1015afd29 100644
14--- a/src/basic/fileio.c
15+++ b/src/basic/fileio.c
16@@ -24,6 +24,7 @@
17 #include <stdint.h>
18 #include <stdlib.h>
19 #include <string.h>
20+#include <sys/mman.h>
21 #include <sys/stat.h>
22 #include <sys/types.h>
23 #include <unistd.h>
24--
252.16.1
26
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 4132cdf40f..d12e94f463 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -48,6 +48,9 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
48 file://0001-Use-uintmax_t-for-handling-rlim_t.patch \ 48 file://0001-Use-uintmax_t-for-handling-rlim_t.patch \
49 file://0001-core-evaluate-presets-after-generators-have-run-6526.patch \ 49 file://0001-core-evaluate-presets-after-generators-have-run-6526.patch \
50 file://0001-main-skip-many-initialization-steps-when-running-in-.patch \ 50 file://0001-main-skip-many-initialization-steps-when-running-in-.patch \
51 file://0001-meson-update-header-file-to-detect-memfd_create.patch \
52 file://0002-configure.ac-Check-if-memfd_create-is-already-define.patch \
53 file://0003-fileio-include-sys-mman.h.patch \
51 " 54 "
52SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" 55SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
53 56