diff options
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_242.bb | 2 |
2 files changed, 1 insertions, 33 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch b/meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch deleted file mode 100644 index 37979755d0..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-Use-getenv-when-secure-versions-are-not-available.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From b8055a61b5df6b43b8d3117936587b874b0a339b Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
| 3 | Date: Mon, 25 Feb 2019 11:01:18 +0800 | ||
| 4 | Subject: [PATCH 01/24] Use getenv when secure versions are not available | ||
| 5 | |||
| 6 | musl doesnt implement secure version, so we default | ||
| 7 | to it if configure does not detect a secure implementation | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | |||
| 11 | Upstream-Status: Denied | ||
| 12 | |||
| 13 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
| 14 | --- | ||
| 15 | src/basic/missing_stdlib.h | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/src/basic/missing_stdlib.h b/src/basic/missing_stdlib.h | ||
| 19 | index 188a8d4..c0ffe86 100644 | ||
| 20 | --- a/src/basic/missing_stdlib.h | ||
| 21 | +++ b/src/basic/missing_stdlib.h | ||
| 22 | @@ -8,6 +8,6 @@ | ||
| 23 | # if HAVE___SECURE_GETENV | ||
| 24 | # define secure_getenv __secure_getenv | ||
| 25 | # else | ||
| 26 | -# error "neither secure_getenv nor __secure_getenv are available" | ||
| 27 | +# define secure_getenv getenv | ||
| 28 | # endif | ||
| 29 | #endif | ||
| 30 | -- | ||
| 31 | 2.7.4 | ||
| 32 | |||
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index 1953fef413..6992062cef 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/meta/recipes-core/systemd/systemd_242.bb | |||
| @@ -32,7 +32,7 @@ SRC_URI += "file://touchscreen.rules \ | |||
| 32 | 32 | ||
| 33 | # patches needed by musl | 33 | # patches needed by musl |
| 34 | SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" | 34 | SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" |
| 35 | SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.patch \ | 35 | SRC_URI_MUSL = "\ |
| 36 | file://0002-don-t-use-glibc-specific-qsort_r.patch \ | 36 | file://0002-don-t-use-glibc-specific-qsort_r.patch \ |
| 37 | file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ | 37 | file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \ |
| 38 | file://0004-add-fallback-parse_printf_format-implementation.patch \ | 38 | file://0004-add-fallback-parse_printf_format-implementation.patch \ |
