From d83b16dbf0862be387f84228710cb165c6d2b03b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 24 Apr 2014 15:59:20 -0300 Subject: 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. Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-extended/at/at_3.1.14.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta/recipes-extended/at') 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" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" DEPENDS = "flex flex-native \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" VIRTUAL-RUNTIME_initscripts ?= "initscripts" -RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ +RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ ${VIRTUAL-RUNTIME_initscripts} \ " @@ -24,7 +24,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ file://file_replacement_with_gplv2.patch \ file://S99at \ file://atd.service \ - ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://pam.conf.patch \ file://configure-add-enable-pam.patch" @@ -37,7 +37,7 @@ EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \ --with-daemon_groupname=root \ --with-jobdir=/var/spool/at/jobs \ --with-atspool=/var/spool/at/spool \ - ac_cv_header_security_pam_appl_h=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} " + ac_cv_header_security_pam_appl_h=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} " inherit autotools-brokensep systemd @@ -62,7 +62,7 @@ do_install () { install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service - if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd fi } -- cgit v1.2.3