* [PATCH 0/1] systemd: avoid musl specific patches affect glibc systems
@ 2019-05-24 2:17 Chen Qi
2019-05-24 2:17 ` [PATCH 1/1] " Chen Qi
0 siblings, 1 reply; 8+ messages in thread
From: Chen Qi @ 2019-05-24 2:17 UTC (permalink / raw)
To: openembedded-core
*** BLURB HERE ***
The following changes since commit 06381a917e7e7648ace4746cbda55dcd138a64ec:
perl/modules: Add various missing ptest perl module dependencies (2019-05-22 07:24:52 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/systemd-musl
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/systemd-musl
Chen Qi (1):
systemd: avoid musl specific patches affect glibc systems
meta/recipes-core/systemd/systemd_242.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
1.9.1
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/1] systemd: avoid musl specific patches affect glibc systems
2019-05-24 2:17 [PATCH 0/1] systemd: avoid musl specific patches affect glibc systems Chen Qi
@ 2019-05-24 2:17 ` Chen Qi
2019-05-24 2:17 ` Khem Raj
2019-05-24 17:31 ` Richard Purdie
0 siblings, 2 replies; 8+ messages in thread
From: Chen Qi @ 2019-05-24 2:17 UTC (permalink / raw)
To: openembedded-core
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@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 \
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] systemd: avoid musl specific patches affect glibc systems
2019-05-24 2:17 ` [PATCH 1/1] " Chen Qi
@ 2019-05-24 2:17 ` Khem Raj
2019-05-24 17:31 ` Richard Purdie
1 sibling, 0 replies; 8+ messages in thread
From: Khem Raj @ 2019-05-24 2:17 UTC (permalink / raw)
To: Chen Qi, openembedded-core
On 5/23/19 7:17 PM, 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.
>
LGTM
> Signed-off-by: Chen Qi <Qi.Chen@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 \
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] systemd: avoid musl specific patches affect glibc systems
2019-05-24 2:17 ` [PATCH 1/1] " Chen Qi
2019-05-24 2:17 ` Khem Raj
@ 2019-05-24 17:31 ` Richard Purdie
2019-05-24 17:58 ` Khem Raj
1 sibling, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2019-05-24 17:31 UTC (permalink / raw)
To: Chen Qi, openembedded-core
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@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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] systemd: avoid musl specific patches affect glibc systems
2019-05-24 17:31 ` Richard Purdie
@ 2019-05-24 17:58 ` Khem Raj
2019-05-24 19:14 ` Martin Jansa
0 siblings, 1 reply; 8+ messages in thread
From: Khem Raj @ 2019-05-24 17:58 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Fri, May 24, 2019 at 10:31 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> 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@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?
>
yes this should be better, SRC_URI_MUSL was introduced so someone
could override it
but if we make it optional then using override is better I think
> Cheers,
>
> Richard
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] systemd: avoid musl specific patches affect glibc systems
2019-05-24 17:58 ` Khem Raj
@ 2019-05-24 19:14 ` Martin Jansa
2019-05-24 19:43 ` Khem Raj
0 siblings, 1 reply; 8+ messages in thread
From: Martin Jansa @ 2019-05-24 19:14 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 2282 bytes --]
It's still nicer to have
SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}"
if the intermediate SRC_URI_MUSL variable is useful.
On Fri, May 24, 2019 at 7:59 PM Khem Raj <raj.khem@gmail.com> wrote:
> On Fri, May 24, 2019 at 10:31 AM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > 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@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?
> >
>
> yes this should be better, SRC_URI_MUSL was introduced so someone
> could override it
> but if we make it optional then using override is better I think
>
> > Cheers,
> >
> > Richard
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 3888 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] systemd: avoid musl specific patches affect glibc systems
2019-05-24 19:14 ` Martin Jansa
@ 2019-05-24 19:43 ` Khem Raj
0 siblings, 0 replies; 8+ messages in thread
From: Khem Raj @ 2019-05-24 19:43 UTC (permalink / raw)
To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer
On Fri, May 24, 2019 at 12:14 PM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> It's still nicer to have
> SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}"
> if the intermediate SRC_URI_MUSL variable is useful.
yeah we can do away with this one variable here.
>
> On Fri, May 24, 2019 at 7:59 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On Fri, May 24, 2019 at 10:31 AM Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>> >
>> > 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@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?
>> >
>>
>> yes this should be better, SRC_URI_MUSL was introduced so someone
>> could override it
>> but if we make it optional then using override is better I think
>>
>> > Cheers,
>> >
>> > Richard
>> >
>> > --
>> > _______________________________________________
>> > Openembedded-core mailing list
>> > Openembedded-core@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/1] systemd: avoid musl specific patches affect glibc systems
2019-05-27 1:33 [PATCH V2 0/1] " Chen Qi
@ 2019-05-27 1:33 ` Chen Qi
0 siblings, 0 replies; 8+ messages in thread
From: Chen Qi @ 2019-05-27 1:33 UTC (permalink / raw)
To: openembedded-core
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@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..93a23dd 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_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 \
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-05-27 1:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-24 2:17 [PATCH 0/1] systemd: avoid musl specific patches affect glibc systems Chen Qi
2019-05-24 2:17 ` [PATCH 1/1] " Chen Qi
2019-05-24 2:17 ` Khem Raj
2019-05-24 17:31 ` Richard Purdie
2019-05-24 17:58 ` Khem Raj
2019-05-24 19:14 ` Martin Jansa
2019-05-24 19:43 ` Khem Raj
2019-05-27 1:33 [PATCH V2 0/1] " Chen Qi
2019-05-27 1:33 ` [PATCH 1/1] " Chen Qi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.