aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-10-18 20:13:00 +0200
committerAndreas Oberritter <obi@opendreambox.org>2017-06-26 22:59:19 +0200
commit19b841def5285755c5af3faf1394d796a7ddb995 (patch)
treee407240dc2fecffe08786fa3c77bca4098e7b560
parentacdd4dfa2c813e0522e733e50b1511da352d64b6 (diff)
downloadmeta-openembedded-contrib-19b841def5285755c5af3faf1394d796a7ddb995.tar.gz
meta-openembedded-contrib-19b841def5285755c5af3faf1394d796a7ddb995.tar.bz2
meta-openembedded-contrib-19b841def5285755c5af3faf1394d796a7ddb995.zip
samba: replace base_contains with bb.utils.contains [backport from master]
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta-networking/recipes-connectivity/samba/samba_4.4.5.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
index e302b943a5..93fc27813a 100644
--- a/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
+++ b/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb
@@ -40,10 +40,10 @@ SYSTEMD_PACKAGES = "${PN}-base winbind"
SYSTEMD_SERVICE_${PN}-base = "nmb.service smb.service"
SYSTEMD_SERVICE_winbind = "winbind.service"
-PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
- ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \
acl cups ldap \
"