summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd/cherokee
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-22 20:48:51 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-04-28 10:38:38 +0200
commite5c807b77fbe753e28483ae7d58d8a5dec676ace (patch)
treec719d92c331ac8682c5f92ebccb93be3b104b41d /meta-webserver/recipes-httpd/cherokee
parent21f10c11f39020f9502d741c774a12d1aeb39499 (diff)
downloadmeta-openembedded-e5c807b77fbe753e28483ae7d58d8a5dec676ace.tar.gz
meta-webserver: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains(). Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/cherokee')
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
index 451e97cb7..5287ea42c 100644
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
+++ b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7 7
8PR = "r9" 8PR = "r9"
9 9
10DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 10DEPENDS = "libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
11 11
12SRC_URI = "http://www.cherokee-project.de/mirrors/cherokee/1.2/${PV}/cherokee-${PV}.tar.gz \ 12SRC_URI = "http://www.cherokee-project.de/mirrors/cherokee/1.2/${PV}/cherokee-${PV}.tar.gz \
13 file://cherokee.init \ 13 file://cherokee.init \
@@ -26,7 +26,7 @@ PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip"
26 26
27EXTRA_OECONF = "--disable-static \ 27EXTRA_OECONF = "--disable-static \
28 --disable-nls \ 28 --disable-nls \
29 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
30 --with-wwwroot=${localstatedir}/www/cherokee \ 30 --with-wwwroot=${localstatedir}/www/cherokee \
31" 31"
32 32