summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2017-06-12 15:10:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 13:53:57 (GMT)
commit4a7ce464fd9ad0b945d63cd31dc74c18c6d0fdc9 (patch)
tree1334165b64fa5406ab88f0595cdfe0a03c5dcde8 /meta/recipes-connectivity/connman
parent00e4662e55f66570cae29240c22b4d74b79d3ca5 (diff)
downloadpoky-4a7ce464fd9ad0b945d63cd31dc74c18c6d0fdc9.tar.gz
connman: correct the systemd boot in read only rootfs
connman fails to start in systemd based read-only images while creating links: Jun 08 12:53:56 qemux86-64 systemd[1]: Starting Create Volatile Files and Directories... Jun 08 12:53:56 qemux86-64 systemd-tmpfiles[366]: [[0;1;31msymlink(/var/run/connman/resolv.conf, /etc/resolv.conf) failed: Read-only file system[[0m Fix this failure and make connman co-exist with systemd-resolved. (From OE-Core rev: 732e1f74bb9f5ecc98b29197f6bcab117710adab) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc15
-rw-r--r--meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch29
-rw-r--r--meta/recipes-connectivity/connman/connman_1.34.bb1
3 files changed, 44 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index cc2d469..ab18f2f 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -13,7 +13,7 @@ LICENSE = "GPLv2"
13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ 13LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \
14 file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36" 14 file://src/main.c;beginline=1;endline=20;md5=486a279a6ab0c8d152bcda3a5b5edc36"
15 15
16inherit autotools pkgconfig systemd update-rc.d bluetooth 16inherit autotools pkgconfig systemd update-rc.d bluetooth update-alternatives
17 17
18DEPENDS = "dbus glib-2.0 ppp readline" 18DEPENDS = "dbus glib-2.0 ppp readline"
19 19
@@ -69,6 +69,11 @@ SYSTEMD_SERVICE_${PN} = "connman.service"
69SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service" 69SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
70SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service" 70SYSTEMD_SERVICE_${PN}-wait-online = "connman-wait-online.service"
71 71
72ALTERNATIVE_PRIORITY = "100"
73ALTERNATIVE_${PN} ="resolv-conf"
74ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.connman"
75ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf"
76
72do_install_append() { 77do_install_append() {
73 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 78 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
74 install -d ${D}${sysconfdir}/init.d 79 install -d ${D}${sysconfdir}/init.d
@@ -89,6 +94,14 @@ do_install_append() {
89 # Automake 1.12 won't install empty directories, but we need the 94 # Automake 1.12 won't install empty directories, but we need the
90 # plugins directory to be present for ownership 95 # plugins directory to be present for ownership
91 mkdir -p ${D}${libdir}/connman/plugins 96 mkdir -p ${D}${libdir}/connman/plugins
97
98 # For read-only filesystem, do not create links during bootup
99 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
100 if ${@bb.utils.contains('IMAGE_FEATURES','read-only-rootfs','true','false',d)}; then
101 echo "d /var/run/connman - - - -" > ${D}${sysconfdir}/tmpfiles.d/connman_resolvconf.conf
102 fi
103 ln -sf ../run/connman/resolv.conf ${D}${sysconfdir}/resolv-conf.connman
104 fi
92} 105}
93 106
94# These used to be plugins, but now they are core 107# These used to be plugins, but now they are core
diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
new file mode 100644
index 0000000..8e2e0bd
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-resolved-when-we-use-co.patch
@@ -0,0 +1,29 @@
1From 9f70b94ebf18f52c115634642652830fa77f27a1 Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Mon, 12 Jun 2017 16:52:39 +0300
4Subject: [PATCH] connman.service: stop systemd-resolved when we use connman
5
6Stop systemd-resolved service when we use connman as network manager.
7
8Upstream-Status: Inappropriate [configuration]
9
10Signed-off-by: Maxin B. John <maxin.john@intel.com>
11---
12 src/connman.service.in | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/src/connman.service.in b/src/connman.service.in
16index 9f5c10f..dab48bc 100644
17--- a/src/connman.service.in
18+++ b/src/connman.service.in
19@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman
20 After=dbus.service network-pre.target systemd-sysusers.service
21 Before=network.target multi-user.target shutdown.target
22 Wants=network.target
23+Conflicts=systemd-resolved.service
24
25 [Service]
26 Type=dbus
27--
282.4.0
29
diff --git a/meta/recipes-connectivity/connman/connman_1.34.bb b/meta/recipes-connectivity/connman/connman_1.34.bb
index 5d0f242..d520568 100644
--- a/meta/recipes-connectivity/connman/connman_1.34.bb
+++ b/meta/recipes-connectivity/connman/connman_1.34.bb
@@ -3,6 +3,7 @@ require connman.inc
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ 4 file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \
5 file://0001-firewall-nftables-fix-build-with-libnftnl-1.0.7.patch \ 5 file://0001-firewall-nftables-fix-build-with-libnftnl-1.0.7.patch \
6 file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \
6 file://connman \ 7 file://connman \
7 file://no-version-scripts.patch \ 8 file://no-version-scripts.patch \
8 file://includes.patch \ 9 file://includes.patch \