Message ID | 20190812175809.27786-1-fontaine.fabrice@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [PATCH/next,1/1] package/systemd: drop host-intltool dependency | expand |
On Mon, 12 Aug 2019 19:58:09 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > intltool is not needed since version 236 and > https://github.com/systemd/systemd/commit/c81217920effddc93fb780cf8f9eb699d6fe1319 > https://github.com/systemd/systemd/commit/9e8f3893e349a68312a817da72b3473b81b6869e > > So drop it and replace it by TARGET_NLS_DEPENDENCIES > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/systemd/systemd.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Applied to master, thanks. Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > On Mon, 12 Aug 2019 19:58:09 +0200 > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: >> intltool is not needed since version 236 and >> https://github.com/systemd/systemd/commit/c81217920effddc93fb780cf8f9eb699d6fe1319 >> https://github.com/systemd/systemd/commit/9e8f3893e349a68312a817da72b3473b81b6869e >> >> So drop it and replace it by TARGET_NLS_DEPENDENCIES >> >> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> >> --- >> package/systemd/systemd.mk | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > Applied to master, thanks. You applied to next (which is IMHO sensible).
On Tue, 13 Aug 2019 09:05:40 +0200 Peter Korsgaard <peter@korsgaard.com> wrote: > > Applied to master, thanks. > > You applied to next (which is IMHO sensible). Yes, sorry, wrong key shortcut :-/ Thomas
Hello, + Thomas P On Mon, Aug 12, 2019 at 02:58 PM, Fabrice Fontaine wrote: > intltool is not needed since version 236 and > https://github.com/systemd/systemd/commit/c81217920effddc93fb780cf8f9eb699d6fe1319 > https://github.com/systemd/systemd/commit/9e8f3893e349a68312a817da72b3473b81b6869e > > So drop it and replace it by TARGET_NLS_DEPENDENCIES > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/systemd/systemd.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > index e8fd7967bd..b6aac6dc53 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -12,10 +12,10 @@ SYSTEMD_INSTALL_STAGING = YES > SYSTEMD_DEPENDENCIES = \ > $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ > host-gperf \ > - host-intltool \ > kmod \ > libcap \ > - util-linux > + util-linux \ > + $(TARGET_NLS_DEPENDENCIES) > > SYSTEMD_PROVIDES = udev > > -- After this patch, 4 runtime tests started to fail. See the run before [1] and after [2] this patch: [1] https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/290109684 [2] https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/290110315 These are the tests: ...ystemSystemdRoIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/289126471 | ORPH ...ystemSystemdRoNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/289126473 | ORPH ...ystemSystemdRwIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/289126476 | ORPH ...ystemSystemdRwNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/289126477 | ORPH systemd build fails at configure step: po/meson.build:4:5: ERROR: Can not do gettext because xgettext is not installed. Running the same tests in my PC without the docker image all 4 tests pass. Autobuilders did not catch this: http://autobuild.buildroot.net/?reason=systemd-241 I tried the bump to 243, the same build error occurs: http://patchwork.ozlabs.org/patch/1157207/ https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/290136894 An error in another package with the same error message was fixed by you in: "56fb7401b9 package/ncmpc: fix build without NLS" Can you investigate this? Regards, Ricardo
Hello Ricardo, Le dim. 8 sept. 2019 à 08:02, Ricardo Martincoski <ricardo.martincoski@gmail.com> a écrit : > > Hello, > > + Thomas P > > On Mon, Aug 12, 2019 at 02:58 PM, Fabrice Fontaine wrote: > > > intltool is not needed since version 236 and > > https://github.com/systemd/systemd/commit/c81217920effddc93fb780cf8f9eb699d6fe1319 > > https://github.com/systemd/systemd/commit/9e8f3893e349a68312a817da72b3473b81b6869e > > > > So drop it and replace it by TARGET_NLS_DEPENDENCIES > > > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > > --- > > package/systemd/systemd.mk | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk > > index e8fd7967bd..b6aac6dc53 100644 > > --- a/package/systemd/systemd.mk > > +++ b/package/systemd/systemd.mk > > @@ -12,10 +12,10 @@ SYSTEMD_INSTALL_STAGING = YES > > SYSTEMD_DEPENDENCIES = \ > > $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ > > host-gperf \ > > - host-intltool \ > > kmod \ > > libcap \ > > - util-linux > > + util-linux \ > > + $(TARGET_NLS_DEPENDENCIES) > > > > SYSTEMD_PROVIDES = udev > > > > -- > > After this patch, 4 runtime tests started to fail. See the run before [1] and > after [2] this patch: > > [1] https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/290109684 > [2] https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/290110315 > > These are the tests: > ...ystemSystemdRoIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/289126471 | ORPH > ...ystemSystemdRoNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/289126473 | ORPH > ...ystemSystemdRwIfupdown | https://gitlab.com/buildroot.org/buildroot/-/jobs/289126476 | ORPH > ...ystemSystemdRwNetworkd | https://gitlab.com/buildroot.org/buildroot/-/jobs/289126477 | ORPH > > systemd build fails at configure step: > po/meson.build:4:5: ERROR: Can not do gettext because xgettext is not installed. > > Running the same tests in my PC without the docker image all 4 tests pass. > > Autobuilders did not catch this: > http://autobuild.buildroot.net/?reason=systemd-241 > > I tried the bump to 243, the same build error occurs: > http://patchwork.ozlabs.org/patch/1157207/ > https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/290136894 > > An error in another package with the same error message was fixed by you in: > "56fb7401b9 package/ncmpc: fix build without NLS" > > Can you investigate this? I think it should be fixed by adding host-gettext to SYSTEMD_DEPENDENCIES. Could you check if it fixes the build failure? I'll then send a patch. > > > Regards, > Ricardo Regards, Fabrice
On Sun, 8 Sep 2019 09:58:54 +0200 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > > Can you investigate this? > I think it should be fixed by adding host-gettext to > SYSTEMD_DEPENDENCIES. Could you check if it fixes the build failure? > I'll then send a patch. So systemd would need host-gettext even when NLS is disabled ? Thomas
On Sun, Sep 8, 2019 at 6:52 AM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > > On Sun, 8 Sep 2019 09:58:54 +0200 > Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > > > > Can you investigate this? > > I think it should be fixed by adding host-gettext to > > SYSTEMD_DEPENDENCIES. Could you check if it fixes the build failure? > > I'll then send a patch. > > So systemd would need host-gettext even when NLS is disabled ? Think so unless you do something like this: https://github.com/systemd/systemd/pull/11294/files#diff-b29c598ec532831e56a6d4ae6d557e0fR4 > > Thomas > -- > Thomas Petazzoni, CTO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Hello, I tested both solutions (host-gettext and the patch from PR). See below. I tested based on the commit before the gperf bump to avoid an unrelated issue. On Sun, Sep 08, 2019 at 11:24 AM, James Hilliard wrote: > On Sun, Sep 8, 2019 at 6:52 AM Thomas Petazzoni > <thomas.petazzoni@bootlin.com> wrote: >> >> On Sun, 8 Sep 2019 09:58:54 +0200 >> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: >> >> > > Can you investigate this? >> > I think it should be fixed by adding host-gettext to >> > SYSTEMD_DEPENDENCIES. Could you check if it fixes the build failure? >> > I'll then send a patch. Sure. https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/290291133 See below. >> >> So systemd would need host-gettext even when NLS is disabled ? > Think so unless you do something like this: > https://github.com/systemd/systemd/pull/11294/files#diff-b29c598ec532831e56a6d4ae6d557e0fR4 https://gitlab.com/RicardoMartincoski/buildroot/-/jobs/290291013 Both solutions fix the build failure. Notice I tested only this specific scenario. Regards, Ricardo
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index e8fd7967bd..b6aac6dc53 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -12,10 +12,10 @@ SYSTEMD_INSTALL_STAGING = YES SYSTEMD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ host-gperf \ - host-intltool \ kmod \ libcap \ - util-linux + util-linux \ + $(TARGET_NLS_DEPENDENCIES) SYSTEMD_PROVIDES = udev
intltool is not needed since version 236 and https://github.com/systemd/systemd/commit/c81217920effddc93fb780cf8f9eb699d6fe1319 https://github.com/systemd/systemd/commit/9e8f3893e349a68312a817da72b3473b81b6869e So drop it and replace it by TARGET_NLS_DEPENDENCIES Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/systemd/systemd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)