diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-22 20:48:49 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2016-05-02 14:03:03 -0700 |
commit | cf1819332d48d3307aa2e80255834aa7911cd0dc (patch) | |
tree | f09b113c456f713beab1df0d084122eaca59570d /meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |
parent | 0e6cc19225103311e5c696618aec3fdaf8a10274 (diff) | |
download | meta-openembedded-cf1819332d48d3307aa2e80255834aa7911cd0dc.tar.gz |
meta-oe: 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: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/syslog-ng.inc')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index ed41f0199..382dc5e30 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |||
@@ -41,8 +41,8 @@ CONFIG_TLS = "--enable-thread-tls" | |||
41 | CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" | 41 | CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" |
42 | 42 | ||
43 | PACKAGECONFIG ??= "openssl \ | 43 | PACKAGECONFIG ??= "openssl \ |
44 | ${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ | 44 | ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ |
45 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | 45 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ |
46 | " | 46 | " |
47 | PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl,openssl," | 47 | PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl,openssl," |
48 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," | 48 | PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," |
@@ -57,7 +57,7 @@ PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wra | |||
57 | PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," | 57 | PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," |
58 | 58 | ||
59 | do_configure_prepend() { | 59 | do_configure_prepend() { |
60 | eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" | 60 | eval "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" |
61 | } | 61 | } |
62 | 62 | ||
63 | do_install_append() { | 63 | do_install_append() { |