summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/at
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:20 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:19:19 +0100
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-extended/at
parent08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff)
downloadpoky-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/at')
-rw-r--r--meta/recipes-extended/at/at_3.1.14.bb10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-extended/at/at_3.1.14.bb b/meta/recipes-extended/at/at_3.1.14.bb
index 1b87d4ad41..68a24b8cd0 100644
--- a/meta/recipes-extended/at/at_3.1.14.bb
+++ b/meta/recipes-extended/at/at_3.1.14.bb
@@ -5,10 +5,10 @@ SECTION = "base"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" 6LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
7DEPENDS = "flex flex-native \ 7DEPENDS = "flex flex-native \
8 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 8 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
9 9
10VIRTUAL-RUNTIME_initscripts ?= "initscripts" 10VIRTUAL-RUNTIME_initscripts ?= "initscripts"
11RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ 11RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \
12 ${VIRTUAL-RUNTIME_initscripts} \ 12 ${VIRTUAL-RUNTIME_initscripts} \
13" 13"
14 14
@@ -24,7 +24,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
24 file://file_replacement_with_gplv2.patch \ 24 file://file_replacement_with_gplv2.patch \
25 file://S99at \ 25 file://S99at \
26 file://atd.service \ 26 file://atd.service \
27 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 27 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
28 28
29PAM_SRC_URI = "file://pam.conf.patch \ 29PAM_SRC_URI = "file://pam.conf.patch \
30 file://configure-add-enable-pam.patch" 30 file://configure-add-enable-pam.patch"
@@ -37,7 +37,7 @@ EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
37 --with-daemon_groupname=root \ 37 --with-daemon_groupname=root \
38 --with-jobdir=/var/spool/at/jobs \ 38 --with-jobdir=/var/spool/at/jobs \
39 --with-atspool=/var/spool/at/spool \ 39 --with-atspool=/var/spool/at/spool \
40 ac_cv_header_security_pam_appl_h=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} " 40 ac_cv_header_security_pam_appl_h=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} "
41 41
42inherit autotools-brokensep systemd 42inherit autotools-brokensep systemd
43 43
@@ -62,7 +62,7 @@ do_install () {
62 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system 62 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system
63 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service 63 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service
64 64
65 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 65 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
66 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd 66 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd
67 fi 67 fi
68} 68}