From 07b3a026433d52deb3d7fd079e0dc13416b364b3 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 26 Nov 2017 00:01:55 +0900
Subject: [PATCH 1/3] test: set log_level to info in test-hwdb and check-help-*

These tests check the stderr. So, if the systemd.log_level=debug
is set in the kernel command line, then these tests fail.
This set log_level to info in hwdb-test.sh and meson-check-help.sh,
the kernel command line not to change the output of the target
programs.

Fixes #7362.
---
 test/hwdb-test.sh         | 1 +
 tools/meson-check-help.sh | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh
index 68c7692eca..a1f3270b64 100755
--- a/test/hwdb-test.sh
+++ b/test/hwdb-test.sh
@@ -22,6 +22,7 @@
 
 set -e
 
+export SYSTEMD_LOG_LEVEL=info
 ROOTDIR=$(dirname $(dirname $(readlink -f $0)))
 SYSTEMD_HWDB=./systemd-hwdb
 
diff --git a/tools/meson-check-help.sh b/tools/meson-check-help.sh
index 47a5099a04..4210491a98 100755
--- a/tools/meson-check-help.sh
+++ b/tools/meson-check-help.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -eu
 
+export SYSTEMD_LOG_LEVEL=info
+
 # output width
 if "$1"  --help | grep -v 'default:' | grep -E -q '.{80}.'; then
         echo "$(basename "$1") --help output is too wide:"

From e481645174e27dfd125f6201b92b8e646adbf204 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 26 Nov 2017 02:17:06 +0900
Subject: [PATCH 2/3] meson: update header file to detect memfd_create()

---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index fd38923b0d..af7a914704 100644
--- a/meson.build
+++ b/meson.build
@@ -442,7 +442,8 @@ foreach ident : ['secure_getenv', '__secure_getenv']
 endforeach
 
 foreach ident : [
-        ['memfd_create',      '''#include <sys/memfd.h>'''],
+        ['memfd_create',      '''#define _GNU_SOURCE
+                                 #include <sys/mman.h>'''],
         ['gettid',            '''#include <sys/types.h>'''],
         ['pivot_root',        '''#include <stdlib.h>'''],     # no known header declares pivot_root
         ['name_to_handle_at', '''#define _GNU_SOURCE

From 7accca234dc413f058082c54bc3fa065b75142e9 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 26 Nov 2017 02:40:23 +0900
Subject: [PATCH 3/3] fileio: include sys/mman.h

---
 src/basic/fileio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index dcb0b758cc..12d6d06fa2 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>