Skip to contentSkip to conversation

systemd: avoid musl specific patches affect glibc systems

PATCH Superseded Chen Qi 4 participants 7 messages May 24, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

cover systemd: avoid musl specific patches affect glibc systems

*** 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(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 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.

---
 meta/recipes-core/systemd/systemd_242.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_242.bb +1 -1
index 2dda0d0..adb592f 100644
@@ -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 \
Signature · 1 line
1.9.1
#2 lore raw
Quoted 6 lines · Chen Qi

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

Quoted 19 lines
---
  meta/recipes-core/systemd/systemd_242.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_242.bb +1 -1
index 2dda0d0..adb592f 100644
@@ -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 \
#3 lore raw
In reply to Chen Qi
Quoted 24 lines · Chen Qi

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.

---
 meta/recipes-core/systemd/systemd_242.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes- renamed from meta/recipes-core/systemd/systemd_242.bb +0 -0

core/systemd/systemd_242.bb
index 2dda0d0..adb592f 100644

meta/recipes-core/systemd/systemd_242.bb +1 -1
@@ -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-

Quoted 4 lines
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

#4 lore raw
Quoted 21 lines · Richard Purdie
Quoted 19 lines · Chen Qi

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.

---
 meta/recipes-core/systemd/systemd_242.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes- renamed from meta/recipes-core/systemd/systemd_242.bb +0 -0

core/systemd/systemd_242.bb
index 2dda0d0..adb592f 100644

meta/recipes-core/systemd/systemd_242.bb +0 -0
@@ -27,7 +27,7 @@ SRC_URI += "file://touchscreen.rules \
            "
 
Quoted 12 lines
Quoted 9 lines
meta/recipes-core/systemd/systemd_242.bb +1 -1
 # 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

Quoted 9 lines

Cheers,

Richard

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#5 lore raw

It's still nicer to have SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}" if the intermediate SRC_URI_MUSL variable is useful.

Quoted 55 lines · Khem Raj
Quoted 21 lines · Richard Purdie
Quoted 19 lines · Chen Qi

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.

---
 meta/recipes-core/systemd/systemd_242.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes- renamed from meta/recipes-core/systemd/systemd_242.bb +0 -0

core/systemd/systemd_242.bb
index 2dda0d0..adb592f 100644

meta/recipes-core/systemd/systemd_242.bb +0 -0
@@ -27,7 +27,7 @@ SRC_URI += "file://touchscreen.rules \
            "
 
Quoted 12 lines
Quoted 9 lines
meta/recipes-core/systemd/systemd_242.bb +1 -1
 # 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

Quoted 9 lines

Cheers,

Richard

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#6 lore raw
Quoted 4 lines · Martin Jansa

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.

Quoted 57 lines · Khem Raj
Quoted 55 lines
Quoted 21 lines · Richard Purdie
Quoted 19 lines · Chen Qi

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.

---
 meta/recipes-core/systemd/systemd_242.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes- renamed from meta/recipes-core/systemd/systemd_242.bb +0 -0

core/systemd/systemd_242.bb
index 2dda0d0..adb592f 100644

meta/recipes-core/systemd/systemd_242.bb +0 -0
@@ -27,7 +27,7 @@ SRC_URI += "file://touchscreen.rules \
            "
 
Quoted 12 lines
Quoted 9 lines
meta/recipes-core/systemd/systemd_242.bb +1 -1
 # 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

Quoted 9 lines

Cheers,

Richard

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core