[OE-core] [PATCH 1/1] systemd: avoid musl specific patches affect glibc systems

Richard Purdie richard.purdie at linuxfoundation.org
Fri May 24 17:31:46 UTC 2019


On Fri, 2019-05-24 at 10:17 +0800, Chen Qi wrote:
> 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 <Qi.Chen at windriver.com>
> ---
>  meta/recipes-core/systemd/systemd_242.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-
> core/systemd/systemd_242.bb
> index 2dda0d0..adb592f 100644
> --- a/meta/recipes-core/systemd/systemd_242.bb
> +++ b/meta/recipes-core/systemd/systemd_242.bb
> @@ -27,7 +27,7 @@ SRC_URI += "file://touchscreen.rules \
>             "
>  
>  # patches needed by musl
> -SRC_URI += "${SRC_URI_MUSL}"
> +SRC_URI += "${@d.getVar('SRC_URI_MUSL') if d.getVar('TCLIBC') ==
> 'musl' else ''}"
>  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 \

Doesn't the usual SRC_URI_append_libc-musl = "X" work?

Cheers,

Richard



More information about the Openembedded-core mailing list