From: Chen Qi Date: Fri, 7 Jun 2019 20:26:39 +0000 (+0300) Subject: systemd: avoid musl specific patches affect glibc systems X-Git-Tag: 2019-04.2-warrior~113 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2ebd3398578c339e17b44b3ae5483cec1d0c7e7d;p=openembedded-core.git systemd: avoid musl specific patches affect glibc systems systemd upstream only care about glibc. We made musl specific patches so that systemd could work. But currently these patches contain potential security issues. So apply these patches only when the libc is musl. Signed-off-by: Chen Qi Signed-off-by: Richard Purdie Signed-off-by: Adrian Bunk Signed-off-by: Armin Kuster --- diff --git a/meta/recipes-core/systemd/systemd_241.bb b/meta/recipes-core/systemd/systemd_241.bb index 3a58f44a3b..eb3242d624 100644 --- a/meta/recipes-core/systemd/systemd_241.bb +++ b/meta/recipes-core/systemd/systemd_241.bb @@ -27,7 +27,7 @@ SRC_URI += "file://touchscreen.rules \ " # patches needed by musl -SRC_URI += "${SRC_URI_MUSL}" +SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.patch \ file://0002-don-t-use-glibc-specific-qsort_r.patch \ file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \