summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-07-03 08:59:27 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-06 14:38:08 +0100
commit7e562e24ed295a36f3d909f57cef017faf73f093 (patch)
treec6d18d0054e1984557acff4fde8a146c25af6ad4
parentf0762f5bad36b7d7d93f8f24bc64cdb0c0d36f09 (diff)
downloadopenembedded-core-contrib-7e562e24ed295a36f3d909f57cef017faf73f093.tar.gz
openembedded-core-contrib-7e562e24ed295a36f3d909f57cef017faf73f093.tar.bz2
openembedded-core-contrib-7e562e24ed295a36f3d909f57cef017faf73f093.zip
systemd: Do not use xlocale.h
glibc specific header which has been removed from glibc 2.26+ Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/systemd/systemd/0022-parse-util-Do-not-include-unneeded-xlocale.h.patch27
-rw-r--r--meta/recipes-core/systemd/systemd_232.bb3
2 files changed, 29 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd/0022-parse-util-Do-not-include-unneeded-xlocale.h.patch b/meta/recipes-core/systemd/systemd/0022-parse-util-Do-not-include-unneeded-xlocale.h.patch
new file mode 100644
index 0000000000..cad1867a4c
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0022-parse-util-Do-not-include-unneeded-xlocale.h.patch
@@ -0,0 +1,27 @@
+From 0c50b8332092178378257c2de800fb6b6b4a8706 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 3 Jul 2017 08:45:04 -0700
+Subject: [PATCH] parse-util: Do not include unneeded xlocale.h
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Backport [ partial https://github.com/systemd/systemd/commit/284d1cd0a12cad96a5ea61d1afb0dd677dbd147e]
+
+ src/basic/parse-util.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
+index c98815b9b..a0eb45805 100644
+--- a/src/basic/parse-util.c
++++ b/src/basic/parse-util.c
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <xlocale.h>
+
+ #include "alloc-util.h"
+ #include "extract-word.h"
+--
+2.13.2
+
diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb
index d54e92707f..287e07b153 100644
--- a/meta/recipes-core/systemd/systemd_232.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -31,7 +31,8 @@ SRC_URI += " \
file://0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \
file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \
-"
+ file://0022-parse-util-Do-not-include-unneeded-xlocale.h.patch \
+ "
SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
PACKAGECONFIG ??= "xz \