diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2017-11-27 16:56:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-06 10:13:56 +0000 |
commit | 806a4c2100f46118beccaa9b221531e351922024 (patch) | |
tree | eb39439cfebfca0f947179be42dee2fa2c93dae8 /meta/recipes-connectivity/connman | |
parent | 17557264a3e3a6a3f3e979f46d553096815cfeb7 (diff) | |
download | poky-806a4c2100f46118beccaa9b221531e351922024.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: ded2a1eef3345f88df0ca00f120eeba4c8f80553)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit 577585375efac8f86223d7549ce39cd70877cbd9)
Signed-off-by: Armin Kuster <akuster808@gmail.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.inc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index 6c8f405a8a..2b03f9cb06 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 | } |