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-core/systemd | |
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-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd_211.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd_211.bb b/meta/recipes-core/systemd/systemd_211.bb index 278de9fd56..ec595bee08 100644 --- a/meta/recipes-core/systemd/systemd_211.bb +++ b/meta/recipes-core/systemd/systemd_211.bb | |||
@@ -11,7 +11,7 @@ PROVIDES = "udev" | |||
11 | PE = "1" | 11 | PE = "1" |
12 | 12 | ||
13 | DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" | 13 | DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" |
14 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 14 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
15 | 15 | ||
16 | SECTION = "base/shell" | 16 | SECTION = "base/shell" |
17 | 17 | ||
@@ -71,7 +71,7 @@ rootlibexecdir = "${rootprefix}/lib" | |||
71 | # The gtk+ tools should get built as a separate recipe e.g. systemd-tools | 71 | # The gtk+ tools should get built as a separate recipe e.g. systemd-tools |
72 | EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ | 72 | EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ |
73 | --with-rootlibdir=${rootlibdir} \ | 73 | --with-rootlibdir=${rootlibdir} \ |
74 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ | 74 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ |
75 | --enable-xz \ | 75 | --enable-xz \ |
76 | --disable-manpages \ | 76 | --disable-manpages \ |
77 | --disable-coredump \ | 77 | --disable-coredump \ |
@@ -117,7 +117,7 @@ do_install() { | |||
117 | 117 | ||
118 | install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ | 118 | install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ |
119 | 119 | ||
120 | if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 120 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
121 | install -d ${D}${sysconfdir}/init.d | 121 | install -d ${D}${sysconfdir}/init.d |
122 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd | 122 | install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd |
123 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd | 123 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd |
@@ -235,7 +235,7 @@ FILES_${PN} = " ${base_bindir}/* \ | |||
235 | /lib/udev/rules.d/71-seat.rules \ | 235 | /lib/udev/rules.d/71-seat.rules \ |
236 | /lib/udev/rules.d/73-seat-late.rules \ | 236 | /lib/udev/rules.d/73-seat-late.rules \ |
237 | /lib/udev/rules.d/99-systemd.rules \ | 237 | /lib/udev/rules.d/99-systemd.rules \ |
238 | ${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)} \ | 238 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)} \ |
239 | " | 239 | " |
240 | 240 | ||
241 | FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" | 241 | FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" |