summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2017-11-27 15:56:41 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-10 22:45:18 (GMT)
commite9e3e60ca61ac2dd7e4e4c369dfd905d3adb5117 (patch)
tree9e440c48103c2caba0d343af5f3e92affc03c593 /meta/recipes-connectivity/connman
parent4a33d7b9cad9f9b83cbd7324d13eb6ace4c7a155 (diff)
downloadpoky-e9e3e60ca61ac2dd7e4e4c369dfd905d3adb5117.tar.gz
connman.inc: do not check IMAGE_FEATURES
Recipes can't rely on IMAGE_FEATURES to determine whether the resulting packages will be used in an image with read/write or read-only rootfs because IMAGE_FEATURES is a per-image recipe variable. The connman.inc code checked IMAGE_FEATURES to determine whether /var/run/connman needs to be created via tmpfiles.d when booting a read-only rootfs. In my tests that is not necessary (anymore?), something (connman itself?) creates the missing directory. (From OE-Core rev: 577585375efac8f86223d7549ce39cd70877cbd9) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@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.inc3
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 6c8f405..2b03f9c 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -97,9 +97,6 @@ do_install_append() {
97 97
98 # For read-only filesystem, do not create links during bootup 98 # For read-only filesystem, do not create links during bootup
99 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 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 100 ln -sf ../run/connman/resolv.conf ${D}${sysconfdir}/resolv-conf.connman
104 fi 101 fi
105} 102}