diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-30 12:14:10 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-02-01 13:48:27 +0000 |
commit | 99aa19ff53922b61dee0c8b63ee7f664f90e9a91 (patch) | |
tree | 551690686c0f9bd61fd3185d8d4cf101482d1a0d /meta-oe/recipes-support/syslog-ng | |
parent | 6f536298c1afcaaff2771c7d0f242259d6b9fc1f (diff) | |
download | meta-openembedded-99aa19ff53922b61dee0c8b63ee7f664f90e9a91.tar.gz |
recipes: use oe.utils.conditional instead of deprecated base_conditional
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index f1bf9b06f..771cdb196 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |||
@@ -41,7 +41,7 @@ EXTRA_OECONF = " \ | |||
41 | " | 41 | " |
42 | 42 | ||
43 | CONFIG_TLS = "--enable-thread-tls" | 43 | CONFIG_TLS = "--enable-thread-tls" |
44 | CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" | 44 | CONFIG_TLS_arm = "${@oe.utils.conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" |
45 | 45 | ||
46 | PACKAGECONFIG ??= " \ | 46 | PACKAGECONFIG ??= " \ |
47 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ | 47 | ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 systemd', d)} \ |
@@ -101,7 +101,7 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}.conf ${sysconfdir}/scl.conf" | |||
101 | 101 | ||
102 | # syslog initscript is handled explicitly because order of | 102 | # syslog initscript is handled explicitly because order of |
103 | # update-rc.d and update-alternatives is important | 103 | # update-rc.d and update-alternatives is important |
104 | RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" | 104 | RDEPENDS_${PN} += " ${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" |
105 | 105 | ||
106 | RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" | 106 | RCONFLICTS_${PN} = "busybox-syslog sysklogd rsyslog" |
107 | 107 | ||