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/initscripts | |
| 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/initscripts')
| -rw-r--r-- | meta/recipes-core/initscripts/initscripts_1.0.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index e8a5b78168..5e0d3778f8 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb | |||
| @@ -41,7 +41,7 @@ KERNEL_VERSION = "" | |||
| 41 | 41 | ||
| 42 | inherit update-alternatives | 42 | inherit update-alternatives |
| 43 | DEPENDS_append = " update-rc.d-native" | 43 | DEPENDS_append = " update-rc.d-native" |
| 44 | DEPENDS_append = " ${@base_contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" | 44 | DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" |
| 45 | 45 | ||
| 46 | PACKAGES =+ "${PN}-functions" | 46 | PACKAGES =+ "${PN}-functions" |
| 47 | RDEPENDS_${PN} = "${PN}-functions" | 47 | RDEPENDS_${PN} = "${PN}-functions" |
| @@ -149,7 +149,7 @@ MASKED_SCRIPTS = " \ | |||
| 149 | urandom" | 149 | urandom" |
| 150 | 150 | ||
| 151 | pkg_postinst_${PN} () { | 151 | pkg_postinst_${PN} () { |
| 152 | if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 152 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
| 153 | if [ -n "$D" ]; then | 153 | if [ -n "$D" ]; then |
| 154 | OPTS="--root=$D" | 154 | OPTS="--root=$D" |
| 155 | fi | 155 | fi |
