diff options
| author | Khem Raj <raj.khem@gmail.com> | 2017-07-03 08:59:27 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-06 14:38:15 +0100 |
| commit | e0a924ab3b80cc89bca3bfc867d44db0f958ec8c (patch) | |
| tree | 9188b9170edbdd44ff0eee7d3fd129fc95e9aec9 | |
| parent | 773d108734916afc4eb0f34c4e58390f11ddf3dc (diff) | |
| download | poky-e0a924ab3b80cc89bca3bfc867d44db0f958ec8c.tar.gz | |
systemd: Do not use xlocale.h
glibc specific header which has been removed from glibc 2.26+
(From OE-Core rev: 7e562e24ed295a36f3d909f57cef017faf73f093)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0022-parse-util-Do-not-include-unneeded-xlocale.h.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_232.bb | 3 |
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 @@ | |||
| 1 | From 0c50b8332092178378257c2de800fb6b6b4a8706 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 3 Jul 2017 08:45:04 -0700 | ||
| 4 | Subject: [PATCH] parse-util: Do not include unneeded xlocale.h | ||
| 5 | |||
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 7 | --- | ||
| 8 | Upstream-Status: Backport [ partial https://github.com/systemd/systemd/commit/284d1cd0a12cad96a5ea61d1afb0dd677dbd147e] | ||
| 9 | |||
| 10 | src/basic/parse-util.c | 1 - | ||
| 11 | 1 file changed, 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c | ||
| 14 | index c98815b9b..a0eb45805 100644 | ||
| 15 | --- a/src/basic/parse-util.c | ||
| 16 | +++ b/src/basic/parse-util.c | ||
| 17 | @@ -23,7 +23,6 @@ | ||
| 18 | #include <stdio.h> | ||
| 19 | #include <stdlib.h> | ||
| 20 | #include <string.h> | ||
| 21 | -#include <xlocale.h> | ||
| 22 | |||
| 23 | #include "alloc-util.h" | ||
| 24 | #include "extract-word.h" | ||
| 25 | -- | ||
| 26 | 2.13.2 | ||
| 27 | |||
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 += " \ | |||
| 31 | file://0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ | 31 | file://0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \ |
| 32 | file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \ | 32 | file://0020-back-port-233-don-t-use-the-unified-hierarchy-for-the-systemd.patch \ |
| 33 | file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \ | 33 | file://0021-build-sys-check-for-lz4-in-the-old-and-new-numbering.patch \ |
| 34 | " | 34 | file://0022-parse-util-Do-not-include-unneeded-xlocale.h.patch \ |
| 35 | " | ||
| 35 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" | 36 | SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" |
| 36 | 37 | ||
| 37 | PACKAGECONFIG ??= "xz \ | 38 | PACKAGECONFIG ??= "xz \ |
