[gnome-continuous-yocto/gnomeostree-3.28-rocko: 33/218] connman.inc: do not check IMAGE_FEATURES
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 33/218] connman.inc: do not check IMAGE_FEATURES
- Date: Mon, 21 May 2018 08:38:00 +0000 (UTC)
commit 806a4c2100f46118beccaa9b221531e351922024
Author: Patrick Ohly <patrick ohly intel com>
Date: Mon Nov 27 16:56:41 2017 +0100
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>
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 6c8f405..2b03f9c 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -97,9 +97,6 @@ do_install_append() {
# For read-only filesystem, do not create links during bootup
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
- if ${@bb.utils.contains('IMAGE_FEATURES','read-only-rootfs','true','false',d)}; then
- echo "d /var/run/connman - - - -" > ${D}${sysconfdir}/tmpfiles.d/connman_resolvconf.conf
- fi
ln -sf ../run/connman/resolv.conf ${D}${sysconfdir}/resolv-conf.connman
fi
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]