All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] pulseaudio: unify volatiles file name
@ 2020-11-02  9:20 Yi Zhao
  2020-11-02  9:20 ` [PATCH 2/2] connman: set service to conflict with systemd-networkd Yi Zhao
  2020-11-02 11:40 ` [OE-core] [PATCH 1/2] pulseaudio: unify volatiles file name Richard Purdie
  0 siblings, 2 replies; 8+ messages in thread
From: Yi Zhao @ 2020-11-02  9:20 UTC (permalink / raw)
  To: openembedded-core

Make the volatiles file name starts with digital.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 4e32b27087..3a26cb59dd 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -149,7 +149,7 @@ do_compile_append () {
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/default/volatiles
-	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
+	install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/04_pulse
 }
 
 USERADD_PACKAGES = "pulseaudio-server"
@@ -192,7 +192,7 @@ FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
 
 FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake"   
 FILES_${PN}-conf = "${sysconfdir}"
-FILES_${PN}-bin += "${sysconfdir}/default/volatiles/volatiles.04_pulse"
+FILES_${PN}-bin += "${sysconfdir}/default/volatiles/04_pulse"
 FILES_${PN}-pa-info = "${bindir}/pa-info"
 FILES_${PN}-server = "${bindir}/pulseaudio ${bindir}/start-* ${sysconfdir} ${bindir}/pactl */udev/rules.d/*.rules */*/udev/rules.d/*.rules ${systemd_user_unitdir}/*"
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/2] connman: set service to conflict with systemd-networkd
  2020-11-02  9:20 [PATCH 1/2] pulseaudio: unify volatiles file name Yi Zhao
@ 2020-11-02  9:20 ` Yi Zhao
  2020-11-30 21:02   ` [OE-core] " Jack Mitchell
  2020-11-02 11:40 ` [OE-core] [PATCH 1/2] pulseaudio: unify volatiles file name Richard Purdie
  1 sibling, 1 reply; 8+ messages in thread
From: Yi Zhao @ 2020-11-02  9:20 UTC (permalink / raw)
  To: openembedded-core

Do not run systemd-networkd and connman simultaneously. These two
network managers may conflict with each other.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ...stop-systemd-networkd-when-using-con.patch | 29 +++++++++++++++++++
 .../connman/connman_1.38.bb                   |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch

diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
new file mode 100644
index 0000000000..dd012750a4
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
@@ -0,0 +1,29 @@
+From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Fri, 30 Oct 2020 13:48:45 +0800
+Subject: [PATCH] connman.service: stop systemd-networkd when using connman
+
+Stop systemd-networkd service when we use connman as network manager.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ src/connman.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/connman.service.in b/src/connman.service.in
+index 79e75d6..014eafe 100644
+--- a/src/connman.service.in
++++ b/src/connman.service.in
+@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
+ After=dbus.service network-pre.target systemd-sysusers.service
+ Before=network.target multi-user.target shutdown.target
+ Wants=network.target
++Conflicts=systemd-networkd.service systemd-networkd.socket
+ Conflicts=systemd-resolved.service
+ 
+ [Service]
+-- 
+2.17.1
+
diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
index 027c41e9af..45c2934dec 100644
--- a/meta/recipes-connectivity/connman/connman_1.38.bb
+++ b/meta/recipes-connectivity/connman/connman_1.38.bb
@@ -3,6 +3,7 @@ require connman.inc
 SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
            file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
            file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
+           file://0001-connman.service-stop-systemd-networkd-when-using-con.patch \
            file://connman \
            file://no-version-scripts.patch \
            "
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 1/2] pulseaudio: unify volatiles file name
  2020-11-02  9:20 [PATCH 1/2] pulseaudio: unify volatiles file name Yi Zhao
  2020-11-02  9:20 ` [PATCH 2/2] connman: set service to conflict with systemd-networkd Yi Zhao
@ 2020-11-02 11:40 ` Richard Purdie
  2020-11-03  1:18   ` Yi Zhao
  1 sibling, 1 reply; 8+ messages in thread
From: Richard Purdie @ 2020-11-02 11:40 UTC (permalink / raw)
  To: Yi Zhao, openembedded-core

On Mon, 2020-11-02 at 17:20 +0800, Yi Zhao wrote:
> Make the volatiles file name starts with digital.

I think you mean starts with a numeric value? Could you say why that is
necessary in the commit message please?

Thanks,

Richard


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 1/2] pulseaudio: unify volatiles file name
  2020-11-02 11:40 ` [OE-core] [PATCH 1/2] pulseaudio: unify volatiles file name Richard Purdie
@ 2020-11-03  1:18   ` Yi Zhao
  0 siblings, 0 replies; 8+ messages in thread
From: Yi Zhao @ 2020-11-03  1:18 UTC (permalink / raw)
  To: Richard Purdie, openembedded-core


On 11/2/20 7:40 PM, Richard Purdie wrote:
> On Mon, 2020-11-02 at 17:20 +0800, Yi Zhao wrote:
>> Make the volatiles file name starts with digital.
> I think you mean starts with a numeric value? Could you say why that is
> necessary in the commit message please?


Just want to make all volatiles file names uniform. Currently in 
oe-core, only this volatile file name is not start with number value.

On a default sato-sdk image:
$ ls /etc/default/volatiles/
00_core  01_bootlogd  99_dbus  99_sshd    99_wpa_supplicant 
volatiles.04_pulse

If this makes sense, I will send v2 with more explanation.

//Yi



>
> Thanks,
>
> Richard
>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 2/2] connman: set service to conflict with systemd-networkd
  2020-11-02  9:20 ` [PATCH 2/2] connman: set service to conflict with systemd-networkd Yi Zhao
@ 2020-11-30 21:02   ` Jack Mitchell
  2020-12-02  2:20     ` Yi Zhao
  0 siblings, 1 reply; 8+ messages in thread
From: Jack Mitchell @ 2020-11-30 21:02 UTC (permalink / raw)
  To: openembedded-core

On 02/11/2020 09:20, Yi Zhao wrote:
> Do not run systemd-networkd and connman simultaneously. These two
> network managers may conflict with each other.
> 
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
>  ...stop-systemd-networkd-when-using-con.patch | 29 +++++++++++++++++++
>  .../connman/connman_1.38.bb                   |  1 +
>  2 files changed, 30 insertions(+)
>  create mode 100644 meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
> 
> diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
> new file mode 100644
> index 0000000000..dd012750a4
> --- /dev/null
> +++ b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
> @@ -0,0 +1,29 @@
> +From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
> +From: Yi Zhao <yi.zhao@windriver.com>
> +Date: Fri, 30 Oct 2020 13:48:45 +0800
> +Subject: [PATCH] connman.service: stop systemd-networkd when using connman
> +
> +Stop systemd-networkd service when we use connman as network manager.
> +
> +Upstream-Status: Inappropriate [configuration]
> +
> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> +---
> + src/connman.service.in | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/src/connman.service.in b/src/connman.service.in
> +index 79e75d6..014eafe 100644
> +--- a/src/connman.service.in
> ++++ b/src/connman.service.in
> +@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
> + After=dbus.service network-pre.target systemd-sysusers.service
> + Before=network.target multi-user.target shutdown.target
> + Wants=network.target
> ++Conflicts=systemd-networkd.service systemd-networkd.socket
> + Conflicts=systemd-resolved.service
> + 
> + [Service]
> +-- 
> +2.17.1
> +
> diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
> index 027c41e9af..45c2934dec 100644
> --- a/meta/recipes-connectivity/connman/connman_1.38.bb
> +++ b/meta/recipes-connectivity/connman/connman_1.38.bb
> @@ -3,6 +3,7 @@ require connman.inc
>  SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
>             file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
>             file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
> +           file://0001-connman.service-stop-systemd-networkd-when-using-con.patch \
>             file://connman \
>             file://no-version-scripts.patch \
>             "
> 

Hi Yi,

This breaks our usecase where we have been using connman and
systemd-networkd in tandem for a long time. IMO this should be reverted
as if the two applications are conflicting then the correct fix is that
they should be configured so that they don't both try to configure the
same interfaces. As systemd-networkd doesn't ship with any rules by
default it shouldn't be doing anything to interfere?

With this patch I can no-longer run both services as it's a hard
conflict with no option to either revert locally, or bbappend this patch
out.

Regards,
Jack.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 2/2] connman: set service to conflict with systemd-networkd
  2020-11-30 21:02   ` [OE-core] " Jack Mitchell
@ 2020-12-02  2:20     ` Yi Zhao
  2020-12-02 12:11       ` Jack Mitchell
  0 siblings, 1 reply; 8+ messages in thread
From: Yi Zhao @ 2020-12-02  2:20 UTC (permalink / raw)
  To: Jack Mitchell, openembedded-core

[-- Attachment #1: Type: text/plain, Size: 4102 bytes --]


On 12/1/20 5:02 AM, Jack Mitchell wrote:
> On 02/11/2020 09:20, Yi Zhao wrote:
>> Do not run systemd-networkd and connman simultaneously. These two
>> network managers may conflict with each other.
>>
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>> ---
>>   ...stop-systemd-networkd-when-using-con.patch | 29 +++++++++++++++++++
>>   .../connman/connman_1.38.bb                   |  1 +
>>   2 files changed, 30 insertions(+)
>>   create mode 100644 meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>>
>> diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>> new file mode 100644
>> index 0000000000..dd012750a4
>> --- /dev/null
>> +++ b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>> @@ -0,0 +1,29 @@
>> +From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
>> +From: Yi Zhao <yi.zhao@windriver.com>
>> +Date: Fri, 30 Oct 2020 13:48:45 +0800
>> +Subject: [PATCH] connman.service: stop systemd-networkd when using connman
>> +
>> +Stop systemd-networkd service when we use connman as network manager.
>> +
>> +Upstream-Status: Inappropriate [configuration]
>> +
>> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>> +---
>> + src/connman.service.in | 1 +
>> + 1 file changed, 1 insertion(+)
>> +
>> +diff --git a/src/connman.service.in b/src/connman.service.in
>> +index 79e75d6..014eafe 100644
>> +--- a/src/connman.service.in
>> ++++ b/src/connman.service.in
>> +@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
>> + After=dbus.service network-pre.target systemd-sysusers.service
>> + Before=network.target multi-user.target shutdown.target
>> + Wants=network.target
>> ++Conflicts=systemd-networkd.service systemd-networkd.socket
>> + Conflicts=systemd-resolved.service
>> +
>> + [Service]
>> +--
>> +2.17.1
>> +
>> diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
>> index 027c41e9af..45c2934dec 100644
>> --- a/meta/recipes-connectivity/connman/connman_1.38.bb
>> +++ b/meta/recipes-connectivity/connman/connman_1.38.bb
>> @@ -3,6 +3,7 @@ require connman.inc
>>   SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
>>              file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
>>              file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
>> +           file://0001-connman.service-stop-systemd-networkd-when-using-con.patch \
>>              file://connman \
>>              file://no-version-scripts.patch \
>>              "
>>
> Hi Yi,
>
> This breaks our usecase where we have been using connman and
> systemd-networkd in tandem for a long time. IMO this should be reverted
> as if the two applications are conflicting then the correct fix is that
> they should be configured so that they don't both try to configure the
> same interfaces. As systemd-networkd doesn't ship with any rules by
> default it shouldn't be doing anything to interfere?


Currently, A systemd-networkd configuration file 80-wired.network from 
systemd-conf package is also installed by default on HW BSPs. Comman is 
the default network-manager in Yocto. It will manage the wired interface 
automatically. But with this configuration file, the systemd-networkd 
will also try to manage the wired interface as connman does. They may 
conflict with each other.In addition to revert this patch, I think we 
should consider whether to install this configuration file by default. 
Maybe it’s better to install it as an example and users can enable it as 
needed.

Thanks,
Yi


>
> With this patch I can no-longer run both services as it's a hard
> conflict with no option to either revert locally, or bbappend this patch
> out.
>
> Regards,
> Jack.
>
> 
>

[-- Attachment #2: Type: text/html, Size: 5538 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 2/2] connman: set service to conflict with systemd-networkd
  2020-12-02  2:20     ` Yi Zhao
@ 2020-12-02 12:11       ` Jack Mitchell
  2020-12-03  9:29         ` kai
  0 siblings, 1 reply; 8+ messages in thread
From: Jack Mitchell @ 2020-12-02 12:11 UTC (permalink / raw)
  To: Yi Zhao, openembedded-core; +Cc: kai.kang

On 02/12/2020 02:20, Yi Zhao wrote:
> 
> On 12/1/20 5:02 AM, Jack Mitchell wrote:
>> On 02/11/2020 09:20, Yi Zhao wrote:
>>> Do not run systemd-networkd and connman simultaneously. These two
>>> network managers may conflict with each other.
>>>
>>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>>> ---
>>>  ...stop-systemd-networkd-when-using-con.patch | 29 +++++++++++++++++++
>>>  .../connman/connman_1.38.bb                   |  1 +
>>>  2 files changed, 30 insertions(+)
>>>  create mode 100644 meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>>>
>>> diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>>> new file mode 100644
>>> index 0000000000..dd012750a4
>>> --- /dev/null
>>> +++ b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>>> @@ -0,0 +1,29 @@
>>> +From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
>>> +From: Yi Zhao <yi.zhao@windriver.com>
>>> +Date: Fri, 30 Oct 2020 13:48:45 +0800
>>> +Subject: [PATCH] connman.service: stop systemd-networkd when using connman
>>> +
>>> +Stop systemd-networkd service when we use connman as network manager.
>>> +
>>> +Upstream-Status: Inappropriate [configuration]
>>> +
>>> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>>> +---
>>> + src/connman.service.in | 1 +
>>> + 1 file changed, 1 insertion(+)
>>> +
>>> +diff --git a/src/connman.service.in b/src/connman.service.in
>>> +index 79e75d6..014eafe 100644
>>> +--- a/src/connman.service.in
>>> ++++ b/src/connman.service.in
>>> +@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
>>> + After=dbus.service network-pre.target systemd-sysusers.service
>>> + Before=network.target multi-user.target shutdown.target
>>> + Wants=network.target
>>> ++Conflicts=systemd-networkd.service systemd-networkd.socket
>>> + Conflicts=systemd-resolved.service
>>> + 
>>> + [Service]
>>> +-- 
>>> +2.17.1
>>> +
>>> diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
>>> index 027c41e9af..45c2934dec 100644
>>> --- a/meta/recipes-connectivity/connman/connman_1.38.bb
>>> +++ b/meta/recipes-connectivity/connman/connman_1.38.bb
>>> @@ -3,6 +3,7 @@ require connman.inc
>>>  SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
>>>             file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
>>>             file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
>>> +           file://0001-connman.service-stop-systemd-networkd-when-using-con.patch \
>>>             file://connman \
>>>             file://no-version-scripts.patch \
>>>             "
>>>
>> Hi Yi,
>>
>> This breaks our usecase where we have been using connman and
>> systemd-networkd in tandem for a long time. IMO this should be reverted
>> as if the two applications are conflicting then the correct fix is that
>> they should be configured so that they don't both try to configure the
>> same interfaces. As systemd-networkd doesn't ship with any rules by
>> default it shouldn't be doing anything to interfere?
> 
> 
> Currently, A systemd-networkd configuration file 80-wired.network from
> systemd-conf package is also installed by default on HW BSPs. Comman is
> the default network-manager in Yocto. It will manage the wired interface
> automatically. But with this configuration file, the systemd-networkd
> will also try to manage the wired interface as connman does. They may
> conflict with each other.In addition to revert this patch, I think we
> should consider whether to install this configuration file by default.
> Maybe it’s better to install it as an example and users can enable it as
> needed.
> 
> Thanks,
> Yi
> 


Hi Yi,

I see, thank you for pointing that out. I agree that we shouldn't be
shipping custom catch-all networkd snippets. Perhaps it should be
something appended by the Poky distro rather than installed by default?
I assume it is included so that network interfaces come up with a DHCP
address by default so people can ssh into the machine without an extra
config.

Cc kai.kang@windriver.com as it looks like they were the original author.

Regards,
Jack.

> 
>> With this patch I can no-longer run both services as it's a hard
>> conflict with no option to either revert locally, or bbappend this patch
>> out.
>>
>> Regards,
>> Jack.
>>
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [OE-core] [PATCH 2/2] connman: set service to conflict with systemd-networkd
  2020-12-02 12:11       ` Jack Mitchell
@ 2020-12-03  9:29         ` kai
  0 siblings, 0 replies; 8+ messages in thread
From: kai @ 2020-12-03  9:29 UTC (permalink / raw)
  To: Jack Mitchell, Yi Zhao, openembedded-core

On 12/2/20 8:11 PM, Jack Mitchell wrote:
> On 02/12/2020 02:20, Yi Zhao wrote:
>> On 12/1/20 5:02 AM, Jack Mitchell wrote:
>>> On 02/11/2020 09:20, Yi Zhao wrote:
>>>> Do not run systemd-networkd and connman simultaneously. These two
>>>> network managers may conflict with each other.
>>>>
>>>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>>>> ---
>>>>   ...stop-systemd-networkd-when-using-con.patch | 29 +++++++++++++++++++
>>>>   .../connman/connman_1.38.bb                   |  1 +
>>>>   2 files changed, 30 insertions(+)
>>>>   create mode 100644 meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>>>>
>>>> diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>>>> new file mode 100644
>>>> index 0000000000..dd012750a4
>>>> --- /dev/null
>>>> +++ b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
>>>> @@ -0,0 +1,29 @@
>>>> +From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
>>>> +From: Yi Zhao <yi.zhao@windriver.com>
>>>> +Date: Fri, 30 Oct 2020 13:48:45 +0800
>>>> +Subject: [PATCH] connman.service: stop systemd-networkd when using connman
>>>> +
>>>> +Stop systemd-networkd service when we use connman as network manager.
>>>> +
>>>> +Upstream-Status: Inappropriate [configuration]
>>>> +
>>>> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>>>> +---
>>>> + src/connman.service.in | 1 +
>>>> + 1 file changed, 1 insertion(+)
>>>> +
>>>> +diff --git a/src/connman.service.in b/src/connman.service.in
>>>> +index 79e75d6..014eafe 100644
>>>> +--- a/src/connman.service.in
>>>> ++++ b/src/connman.service.in
>>>> +@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
>>>> + After=dbus.service network-pre.target systemd-sysusers.service
>>>> + Before=network.target multi-user.target shutdown.target
>>>> + Wants=network.target
>>>> ++Conflicts=systemd-networkd.service systemd-networkd.socket
>>>> + Conflicts=systemd-resolved.service
>>>> +
>>>> + [Service]
>>>> +--
>>>> +2.17.1
>>>> +
>>>> diff --git a/meta/recipes-connectivity/connman/connman_1.38.bb b/meta/recipes-connectivity/connman/connman_1.38.bb
>>>> index 027c41e9af..45c2934dec 100644
>>>> --- a/meta/recipes-connectivity/connman/connman_1.38.bb
>>>> +++ b/meta/recipes-connectivity/connman/connman_1.38.bb
>>>> @@ -3,6 +3,7 @@ require connman.inc
>>>>   SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
>>>>              file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
>>>>              file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
>>>> +           file://0001-connman.service-stop-systemd-networkd-when-using-con.patch \
>>>>              file://connman \
>>>>              file://no-version-scripts.patch \
>>>>              "
>>>>
>>> Hi Yi,
>>>
>>> This breaks our usecase where we have been using connman and
>>> systemd-networkd in tandem for a long time. IMO this should be reverted
>>> as if the two applications are conflicting then the correct fix is that
>>> they should be configured so that they don't both try to configure the
>>> same interfaces. As systemd-networkd doesn't ship with any rules by
>>> default it shouldn't be doing anything to interfere?
>>
>> Currently, A systemd-networkd configuration file 80-wired.network from
>> systemd-conf package is also installed by default on HW BSPs. Comman is
>> the default network-manager in Yocto. It will manage the wired interface
>> automatically. But with this configuration file, the systemd-networkd
>> will also try to manage the wired interface as connman does. They may
>> conflict with each other.In addition to revert this patch, I think we
>> should consider whether to install this configuration file by default.
>> Maybe it’s better to install it as an example and users can enable it as
>> needed.
>>
>> Thanks,
>> Yi
>>
>
> Hi Yi,
>
> I see, thank you for pointing that out. I agree that we shouldn't be
> shipping custom catch-all networkd snippets. Perhaps it should be
> something appended by the Poky distro rather than installed by default?
> I assume it is included so that network interfaces come up with a DHCP
> address by default so people can ssh into the machine without an extra
> config.

Hi Jack,

The original defect is 
https://bugzilla.yoctoproject.org/show_bug.cgi?id=13057 . There is no 
network on core-image-small, so I provided
the default config for systemd-networkd. Because systemd-networkd is 
more basic than connman and networkmanager that maybe neither
of them is installed.

The conflict should be resolved but I don't have solution yet right now.

Regards,
Kai

>
> Cc kai.kang@windriver.com as it looks like they were the original author.
>
> Regards,
> Jack.
>
>>> With this patch I can no-longer run both services as it's a hard
>>> conflict with no option to either revert locally, or bbappend this patch
>>> out.
>>>
>>> Regards,
>>> Jack.
>>>
>>
>> 
>>


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-12-03  9:29 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-02  9:20 [PATCH 1/2] pulseaudio: unify volatiles file name Yi Zhao
2020-11-02  9:20 ` [PATCH 2/2] connman: set service to conflict with systemd-networkd Yi Zhao
2020-11-30 21:02   ` [OE-core] " Jack Mitchell
2020-12-02  2:20     ` Yi Zhao
2020-12-02 12:11       ` Jack Mitchell
2020-12-03  9:29         ` kai
2020-11-02 11:40 ` [OE-core] [PATCH 1/2] pulseaudio: unify volatiles file name Richard Purdie
2020-11-03  1:18   ` Yi Zhao

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.