* [PATCH] systemd: resolved linked even if the option is disabled
@ 2018-05-30 13:24 nick83ola
2018-05-30 14:38 ` [poky][PATCH] " nick83ola
2018-06-06 8:48 ` [PATCH] " nick83ola
0 siblings, 2 replies; 5+ messages in thread
From: nick83ola @ 2018-05-30 13:24 UTC (permalink / raw)
To: poky
[-- Attachment #1: Type: text/plain, Size: 2937 bytes --]
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@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
[-- Attachment #2: Type: text/html, Size: 3724 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread* [poky][PATCH] systemd: resolved linked even if the option is disabled
2018-05-30 13:24 [PATCH] systemd: resolved linked even if the option is disabled nick83ola
@ 2018-05-30 14:38 ` nick83ola
2018-06-06 8:48 ` [PATCH] " nick83ola
1 sibling, 0 replies; 5+ messages in thread
From: nick83ola @ 2018-05-30 14:38 UTC (permalink / raw)
To: openembedded-core
---------- Forwarded message ----------
From: nick83ola <nick83ola@gmail.com>
Date: 30 May 2018 at 14:24
Subject: [poky][PATCH] systemd: resolved linked even if the option is disabled
To: poky@yoctoproject.org
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@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
--
P.S. Le informazioni trasmesse attraverso la presente comunicazione
sono di esclusiva
spettanza dell'effettivo destinatario. Nel caso in cui le stesse
raggiungessero, per
qualunque motivo, soggetti non interessati, questi ultimi vorranno
darne immediata
notizia al mittente. In ogni caso, eventuali soggetti diversi dai
legittimi destinatari
della presente comunicazione e dei dati contenuti negli allegati, possono essere
sanzionati ai sensi del T.U. sul trattamento dei dati personali d.lgs.
196/2003, sia ai
sensi dell'art. 616 del Codice Penale che disciplina la violazione del
segreto sulla
corrispondenza.
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] systemd: resolved linked even if the option is disabled
2018-05-30 13:24 [PATCH] systemd: resolved linked even if the option is disabled nick83ola
2018-05-30 14:38 ` [poky][PATCH] " nick83ola
@ 2018-06-06 8:48 ` nick83ola
2018-06-11 11:40 ` nick83ola
1 sibling, 1 reply; 5+ messages in thread
From: nick83ola @ 2018-06-06 8:48 UTC (permalink / raw)
To: poky
ping
On 30 May 2018 at 14:24, nick83ola <nick83ola@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@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
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] systemd: resolved linked even if the option is disabled
2018-06-06 8:48 ` [PATCH] " nick83ola
@ 2018-06-11 11:40 ` nick83ola
2018-06-12 1:47 ` ChenQi
0 siblings, 1 reply; 5+ messages in thread
From: nick83ola @ 2018-06-11 11:40 UTC (permalink / raw)
To: poky
Hi,
Anyone can look at this?
Thanks
Nicola Lunghi
On Wed, 6 Jun 2018 at 09:48, nick83ola <nick83ola@gmail.com> wrote:
>
> ping
>
> On 30 May 2018 at 14:24, nick83ola <nick83ola@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@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
> >
> >
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] systemd: resolved linked even if the option is disabled
2018-06-11 11:40 ` nick83ola
@ 2018-06-12 1:47 ` ChenQi
0 siblings, 0 replies; 5+ messages in thread
From: ChenQi @ 2018-06-12 1:47 UTC (permalink / raw)
To: poky, nick83ola
Hi Nicola,
Patches for recipes in oe-core should be sent to
openembedded-core@lists.openembedded.org.
Back to this patch, I think you need to first check the following three
commits.
commit 00e4662e55f66570cae29240c22b4d74b79d3ca5
Author: Maxin B. John <maxin.john@intel.com>
Date: Mon Jun 12 18:10:21 2017 +0300
systemd: enable resolved and networkd
Enable systemd-resolved and systemd-networkd by default.
Make it co-exist with connman and Fix associated problems
in read-only rootfs.
Fixes [YOCTO #11331]
(From OE-Core rev: d9b6d538e3d81ab0d5e7b7b6adecef555d782217)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
commit 669edd04432f8e76e32bd7f34f4d9aa63eef4038
Author: Khem Raj <raj.khem@gmail.com>
Date: Fri Dec 16 14:07:31 2016 -0800
systemd: point to correct resolv.conf when resolved is enabled
latest systemd has changed the resolved defaults which points to
127.0.0.53 port 53 on local network. If someone wants to use
host-local IP address then it can be pointed to copy in /lib/systemd
(From OE-Core rev: 99d1199fd0961f94732a1a533d66472ca17cf6f5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
commit b80da02ce9b683f96393fe0ea1f5f1a5f1a07c89
Author: Christopher Larson <chris_larson@mentor.com>
Date: Wed Nov 4 20:19:19 2015 -0700
systemd: arrange for volatile /etc/resolv.conf
On sysvinit systems, volatiles is configured to make
/etc/resolv.conf symlink
to a file in a volatile path, which lets us write to
/etc/resolv.conf for
read-only-rootfs. For systemd, this isn't set up unless we enable
systemd-resolved, which we don't by default. When it's not enabled,
create the
/etc/resolv.conf symlink and ensure the volatile path is created on
boot with
tmpfiles.d.
(From OE-Core rev: 7f087f161e8942bcd35f88999dfca418f01cd7fa)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
What's the actual build or runtime problem in your case?
Best Regards,
Chen Qi
On 06/11/2018 07:40 PM, nick83ola wrote:
> Hi,
>
> Anyone can look at this?
>
> Thanks
> Nicola Lunghi
>
> On Wed, 6 Jun 2018 at 09:48, nick83ola <nick83ola@gmail.com> wrote:
>> ping
>>
>> On 30 May 2018 at 14:24, nick83ola <nick83ola@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@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
>>>
>>>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-06-12 1:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-30 13:24 [PATCH] systemd: resolved linked even if the option is disabled nick83ola
2018-05-30 14:38 ` [poky][PATCH] " nick83ola
2018-06-06 8:48 ` [PATCH] " nick83ola
2018-06-11 11:40 ` nick83ola
2018-06-12 1:47 ` ChenQi
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.