diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:50 +0100 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-05-05 11:41:28 -0400 |
| commit | 275b6c30fbe4f2e6d8c607e9f2eedd5c230c0802 (patch) | |
| tree | 4fd20a242b848ec8497066801b86706de3defdce /meta-networking/recipes-support/openvpn | |
| parent | 7a9c626092c7d3b10206c7ca4ea2827cca9cba4f (diff) | |
| download | meta-openembedded-275b6c30fbe4f2e6d8c607e9f2eedd5c230c0802.tar.gz | |
meta-networking: 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>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/openvpn')
| -rw-r--r-- | meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb b/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb index f0109069cb..de2348e8ea 100644 --- a/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb +++ b/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://openvpn.sourceforge.net" SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" -DEPENDS = "lzo openssl iproute2 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" inherit autotools systemd @@ -22,7 +22,7 @@ CFLAGS += "-fno-inline" # I want openvpn to be able to read password from file (hrw) EXTRA_OECONF += "--enable-password-save --enable-iproute2" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" # Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. EXTRA_OECONF += "IPROUTE=/sbin/ip" @@ -38,7 +38,7 @@ do_install_append() { install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys - 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}/openvpn@.service ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service |