Re: [OE-core] [PATCH 6/6] systemd: change SRC_URI back to include musl patches unconditionally
OK. I separated them just for easier review. I'll send out V4. Best Regards, Chen Qi On 07/12/2018 05:31 PM, Burton, Ross wrote: Can you squash this, and the other fixes, into the recipe upgrade? Master doesn't need to see the revisions and fixes, and having commits which are broken is bad for bisecting. Ross On 12 July 2018 at 07:12, Chen Qi wrote: Signed-off-by: Chen Qi --- meta/recipes-core/systemd/systemd_239.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb index 99fbfc1..ce8cc9a 100644 --- a/meta/recipes-core/systemd/systemd_239.bb +++ b/meta/recipes-core/systemd/systemd_239.bb @@ -30,7 +30,7 @@ SRC_URI += "file://touchscreen.rules \ SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" # patches made for musl are only applied on TCLIBC is musl -SRC_URI += "${@d.getVar('SRC_URI_MUSL') if d.getVar('TCLIBC') == 'musl' else ''}" +SRC_URI += "${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-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ -- 1.9.1 -- ___ 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
Re: [OE-core] [PATCH 6/6] systemd: change SRC_URI back to include musl patches unconditionally
Can you squash this, and the other fixes, into the recipe upgrade? Master doesn't need to see the revisions and fixes, and having commits which are broken is bad for bisecting. Ross On 12 July 2018 at 07:12, Chen Qi wrote: > Signed-off-by: Chen Qi > --- > meta/recipes-core/systemd/systemd_239.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/systemd/systemd_239.bb > b/meta/recipes-core/systemd/systemd_239.bb > index 99fbfc1..ce8cc9a 100644 > --- a/meta/recipes-core/systemd/systemd_239.bb > +++ b/meta/recipes-core/systemd/systemd_239.bb > @@ -30,7 +30,7 @@ SRC_URI += "file://touchscreen.rules \ > SRC_URI_append_qemuall = " > file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" > > # patches made for musl are only applied on TCLIBC is musl > -SRC_URI += "${@d.getVar('SRC_URI_MUSL') if d.getVar('TCLIBC') == 'musl' else > ''}" > +SRC_URI += "${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-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch \ > -- > 1.9.1 > > -- > ___ > 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