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 <[email protected]> --- meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb | 4 ++-- meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb | 4 ++-- meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb | 2 +- meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb | 2 +- meta-webserver/recipes-httpd/nginx/nginx.inc | 2 +- meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb index df25034..81151d1 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.20.bb @@ -57,7 +57,7 @@ EXTRA_OECONF = "--enable-ssl \ --enable-mpms-shared \ ac_cv_have_threadsafe_pollset=no" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" @@ -86,7 +86,7 @@ do_install_append() { # Set 'ServerName' to fix error messages when restart apache service sed -i 's/^#ServerName www.example.com/ServerName localhost/' ${D}/${sysconfdir}/${BPN}/httpd.conf - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ install -m 0644 ${WORKDIR}/apache2-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ fi 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 451e97c..5287ea4 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" PR = "r9" -DEPENDS = "libpcre openssl mysql5 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://www.cherokee-project.de/mirrors/cherokee/1.2/${PV}/cherokee-${PV}.tar.gz \ file://cherokee.init \ @@ -26,7 +26,7 @@ PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip" EXTRA_OECONF = "--disable-static \ --disable-nls \ - ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ --with-wwwroot=${localstatedir}/www/cherokee \ " diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb index 31293e4..7062174 100644 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.2.bb @@ -48,7 +48,7 @@ do_install_append() { # by default if php is installed echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system fi diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb index 22d88f8..be8ed37 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb @@ -58,7 +58,7 @@ do_install_append() { mkdir -p ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system fi diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 2169b67..ebf926a 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -66,7 +66,7 @@ do_configure () { do_install () { oe_runmake 'DESTDIR=${D}' install rm -fr ${D}${localstatedir}/run ${D}/run - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/${BPN} - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb index fe860ec..562ecd0 100644 --- a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb +++ b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.5.bb @@ -46,7 +46,7 @@ do_install() { install -m 0644 ${WORKDIR}/nhttpd.conf ${D}${sysconfdir} install -m 0755 ${WORKDIR}/nostromo ${D}${sysconfdir}/init.d install -D -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/nostromo - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -D -m 0644 ${WORKDIR}/tmpfiles.conf ${D}${sysconfdir}/tmpfiles.d/nostromo.conf fi install -m 0644 htdocs/index.html ${D}${localstatedir}/nostromo/htdocs/index.html -- 2.8.0.rc3 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
