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-extended/screen | |
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-extended/screen')
-rw-r--r-- | meta/recipes-extended/screen/screen_4.0.3.bb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb index d83dda03c2..6fd02a07cb 100644 --- a/meta/recipes-extended/screen/screen_4.0.3.bb +++ b/meta/recipes-extended/screen/screen_4.0.3.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0774d66808b0f602e94448108f59448b \ | |||
11 | 11 | ||
12 | SECTION = "console/utils" | 12 | SECTION = "console/utils" |
13 | DEPENDS = "ncurses \ | 13 | DEPENDS = "ncurses \ |
14 | ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 14 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
15 | RDEPENDS_${PN} = "base-files" | 15 | RDEPENDS_${PN} = "base-files" |
16 | 16 | ||
17 | PR = "r4" | 17 | PR = "r4" |
@@ -20,7 +20,7 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \ | |||
20 | ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-14.diff.gz;name=patch \ | 20 | ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-14.diff.gz;name=patch \ |
21 | file://configure.patch \ | 21 | file://configure.patch \ |
22 | file://fix-parallel-make.patch \ | 22 | file://fix-parallel-make.patch \ |
23 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" | 23 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" |
24 | 24 | ||
25 | PAM_SRC_URI = "file://screen.pam" | 25 | PAM_SRC_URI = "file://screen.pam" |
26 | 26 | ||
@@ -33,10 +33,10 @@ SRC_URI[patch.sha256sum] = "10acb274b2fb0bb7137a0d66e52fa0f18125bc5198c7a8d5af38 | |||
33 | inherit autotools | 33 | inherit autotools |
34 | 34 | ||
35 | EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ | 35 | EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ |
36 | ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" | 36 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" |
37 | 37 | ||
38 | do_install_append () { | 38 | do_install_append () { |
39 | if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 39 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then |
40 | install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen | 40 | install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen |
41 | fi | 41 | fi |
42 | } | 42 | } |