diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-graphics/x11-common | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/x11-common')
-rw-r--r-- | meta/recipes-graphics/x11-common/xserver-nodm-init.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb index e4508a917d..0a16ff5f83 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb | |||
@@ -22,7 +22,7 @@ do_install() { | |||
22 | install -d ${D}${sysconfdir}/init.d | 22 | install -d ${D}${sysconfdir}/init.d |
23 | install xserver-nodm ${D}${sysconfdir}/init.d | 23 | install xserver-nodm ${D}${sysconfdir}/init.d |
24 | 24 | ||
25 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 25 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
26 | install -d ${D}${sysconfdir}/default | 26 | install -d ${D}${sysconfdir}/default |
27 | install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm | 27 | install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm |
28 | install -d ${D}${systemd_unitdir}/system | 28 | install -d ${D}${systemd_unitdir}/system |
@@ -36,7 +36,7 @@ do_install() { | |||
36 | fi | 36 | fi |
37 | fi | 37 | fi |
38 | 38 | ||
39 | if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 39 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
40 | if [ "${ROOTLESS_X}" = "1" ] ; then | 40 | if [ "${ROOTLESS_X}" = "1" ] ; then |
41 | install -d ${D}${sysconfdir}/X11 | 41 | install -d ${D}${sysconfdir}/X11 |
42 | install Xusername ${D}${sysconfdir}/X11 | 42 | install Xusername ${D}${sysconfdir}/X11 |