Skip to contentSkip to conversation

pulseaudio: unify volatiles file name

PATCH Superseded Yi Zhao 4 participants 8 messages Nov 2, 2020 – Dec 3, 2020

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

PATCH 1/2 pulseaudio: unify volatiles file name

Make the volatiles file name starts with digital.

---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +2 -2
index 4e32b27087..3a26cb59dd 100644
@@ -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}/*"
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 connman: set service to conflict with systemd-networkd

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

---
 ...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
meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch new file +29 -0
new file mode 100644
index 0000000000..dd012750a4
@@ -0,0 +1,29 @@
+From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-connectivity/connman/connman_1.38.bb +1 -0
index 027c41e9af..45c2934dec 100644
@@ -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 \
            "
Signature · 1 line
2.17.1
#2 lore raw

Re: [OE-core] [PATCH 2/2] connman: set service to conflict with systemd-networkd

Quoted 51 lines · Yi Zhao

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

---
 ...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
meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch new file +29 -0
new file mode 100644
index 0000000000..dd012750a4
@@ -0,0 +1,29 @@
+From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-connectivity/connman/connman_1.38.bb +0 -0
index 027c41e9af..45c2934dec 100644

meta/recipes-connectivity/connman/connman_1.38.bb require connman.inc · line 9

Quoted 7 lines
meta/recipes-connectivity/connman/connman_1.38.bb +1 -0
@@ -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.

author
#3 lore raw

Re: [OE-core] [PATCH 2/2] connman: set service to conflict with systemd-networkd

Quoted 61 lines · Jack Mitchell
Quoted 51 lines · Yi Zhao

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

---
  ...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

meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch new file +29 -0
new file mode 100644
index 0000000000..dd012750a4
@@ -0,0 +1,29 @@
+From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-connectivity/connman/connman_1.38.bb +0 -0
index 027c41e9af..45c2934dec 100644

meta/recipes-connectivity/connman/connman_1.38.bb require connman.inc · line 9

Quoted 7 lines
meta/recipes-connectivity/connman/connman_1.38.bb +1 -0
@@ -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,

Quoted 6 lines

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

Quoted 10 lines

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.

#4 lore raw

Re: [OE-core] [PATCH 2/2] connman: set service to conflict with systemd-networkd

Quoted 81 lines · Yi Zhao
Quoted 61 lines · Jack Mitchell
Quoted 51 lines · Yi Zhao

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

---
 ...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
meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch new file +29 -0
new file mode 100644
index 0000000000..dd012750a4
@@ -0,0 +1,29 @@
+From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-connectivity/connman/connman_1.38.bb +0 -0
index 027c41e9af..45c2934dec 100644

meta/recipes-connectivity/connman/connman_1.38.bb require connman.inc · line 9

Quoted 7 lines
meta/recipes-connectivity/connman/connman_1.38.bb +1 -0
@@ -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,

Quoted 6 lines

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.

Quoted 3 lines

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 [email protected] as it looks like they were the original author.

Regards,
Jack.

Quoted 12 lines
Quoted 8 lines

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.

#5 lore raw

Re: [OE-core] [PATCH 2/2] connman: set service to conflict with systemd-networkd

Quoted 84 lines · Jack Mitchell
Quoted 79 lines · Yi Zhao
Quoted 61 lines · Jack Mitchell
Quoted 51 lines · Yi Zhao

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

---
  ...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

meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch new file +29 -0
new file mode 100644
index 0000000000..dd012750a4
@@ -0,0 +1,29 @@
+From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <[email protected]>
+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 <[email protected]>
+---
+ 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
+
meta/recipes-connectivity/connman/connman_1.38.bb +0 -0
index 027c41e9af..45c2934dec 100644

meta/recipes-connectivity/connman/connman_1.38.bb require connman.inc · line 9

Quoted 7 lines
meta/recipes-connectivity/connman/connman_1.38.bb +1 -0
@@ -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,

Quoted 6 lines

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.

Quoted 3 lines

Thanks,
Yi

Quoted 8 lines

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

Quoted 16 lines

Cc [email protected] as it looks like they were the original author.

Regards,
Jack.

Quoted 10 lines
Quoted 7 lines

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.

#6 lore raw
In reply to Yi Zhao
Quoted 1 line · Yi Zhao

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

author
#7 lore raw
Quoted 4 lines · Richard Purdie
Quoted 1 line · Yi Zhao

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

Quoted 5 lines

Thanks,

Richard