[poky] [PATCH] systemd: resolved linked even if the option is disabled

nick83ola nick83ola at gmail.com
Mon Jun 11 04:40:20 PDT 2018


Hi,

Anyone can look at this?

Thanks
Nicola Lunghi

On Wed, 6 Jun 2018 at 09:48, nick83ola <nick83ola at gmail.com> wrote:
>
> ping
>
> On 30 May 2018 at 14:24, nick83ola <nick83ola at gmail.com> wrote:
> > systemd: resolved linked even if the option is disabled
> >
> > in the do_install function in systemd recipe the condition to check
> > if the resolved option is selected is reversed (wrong !).
> > This is for example true if we compile systemd with musl instead of
> > glibc (every poky-image-minimal recipe).
> >
> > Also no link should be created if the option is not selected
> > nor an ALTERNATIVE set.
> >
> > Signed-off-by: Nicola Lunghi <nick83ola at gmail.com>
> > ---
> >  meta/recipes-core/systemd/systemd_237.bb | 8 +++-----
> >  1 file changed, 3 insertions(+), 5 deletions(-)
> >
> > diff --git a/meta/recipes-core/systemd/systemd_237.bb
> > b/meta/recipes-core/systemd/systemd_237.bb
> > index 2e6558ded1..2eea6af508 100644
> > --- a/meta/recipes-core/systemd/systemd_237.bb
> > +++ b/meta/recipes-core/systemd/systemd_237.bb
> > @@ -256,14 +256,11 @@ do_install() {
> >      if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
> >          ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e
> > "\$ad /run/systemd/netif/links 0755 root root -"
> > ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
> >      fi
> > -    if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false',
> > d)}; then
> > +    if ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false',
> > d)}; then
> >          echo 'L! ${sysconfdir}/resolv.conf - - - -
> > ../run/systemd/resolve/resolv.conf'
> >>>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
> >          echo 'd /run/systemd/resolve 0755 root root -'
> >>>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
> >          echo 'f /run/systemd/resolve/resolv.conf 0644 root root'
> >>>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
> >          ln -s ../run/systemd/resolve/resolv.conf
> > ${D}${sysconfdir}/resolv-conf.systemd
> > -    else
> > -        sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - -
> > ../run/systemd/resolve/resolv.conf%g"
> > ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
> > -        ln -s ../run/systemd/resolve/resolv.conf
> > ${D}${sysconfdir}/resolv-conf.systemd
> >      fi
> >      install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON
> > ${D}${systemd_unitdir}/systemd-sysv-install
> >
> > @@ -537,7 +534,7 @@ python __anonymous() {
> >  # TODO:
> >  # u-a for runlevel and telinit
> >
> > -ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel
> > resolv-conf"
> > +ALTERNATIVE_${PN} = "init halt reboot shutdown poweroff runlevel"
> >
> >  ALTERNATIVE_TARGET[init] = "${rootlibexecdir}/systemd/systemd"
> >  ALTERNATIVE_LINK_NAME[init] = "${base_sbindir}/init"
> > @@ -563,6 +560,7 @@ ALTERNATIVE_TARGET[runlevel] =
> > "${base_bindir}/systemctl"
> >  ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel"
> >  ALTERNATIVE_PRIORITY[runlevel] ?= "300"
> >
> > +ALTERNATIVE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved',
> > 'resolv-conf', '', d)}"
> >  ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd"
> >  ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf"
> >  ALTERNATIVE_PRIORITY[resolv-conf] ?= "50"
> > --
> > 2.17.0
> >
> >


More information about the poky mailing list