From d58bd2a32ea0d71275a55ef92ce1563a75282a04 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 21 Apr 2014 02:21:05 -0400 Subject: [PATCH] rsyslog: add PACKAGECONFIG for optional features rsyslog supports many optional features, add PACKAGECONFIG for them to ensures that the dependency on related packages is deterministic and so that we can easily enable/disable features. (From meta-openembedded rev: 9ef1b542367416e2f2e418f33871f773d63a7bda) Signed-off-by: Jackie Huang Signed-off-by: Patrick Ohly --- .../recipes-extended/rsyslog/rsyslog_7.4.4.bb | 34 ++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb index b1392e9..3801933 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb @@ -10,7 +10,6 @@ Rsyslog is an enhanced syslogd supporting, among others, MySQL,\ very easy to setup for the novice user." DEPENDS = "zlib libestr json-c" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" HOMEPAGE = "http://www.rsyslog.com/" LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ @@ -27,7 +26,38 @@ SRC_URI[sha256sum] = "276d094d1e4c62c770ec8a72723667f119eee038912b79cf3337d439bc inherit autotools pkgconfig systemd update-rc.d -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)} --enable-cached-man-pages" +EXTRA_OECONF += "--enable-cached-man-pages" + +# first line is default yes in configure +PACKAGECONFIG ??= " \ + zlib rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ + imdiag gnutls \ + ${@base_contains('DISTRO_FEATURES', 'snmp', 'snmp', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ +" + +# default yes in configure +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," +PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,," +PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,," +PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," +PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," +PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," +PACKAGECONFIG[uuid] = "--enable-uuid,--disable-uuid,util-linux," +PACKAGECONFIG[libgcrypt] = "--enable-libgcrypt,--disable-libgcrypt,libgcrypt," +PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," + +# default no in configure +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," +PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,," +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," +PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," +PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," +PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5," +PACKAGECONFIG[postgresql] = "--enable-pgsql,--disable-pgsql,postgresql," +PACKAGECONFIG[libdbi] = "--enable-libdbi,--disable-libdbi,libdbi," +PACKAGECONFIG[mail] = "--enable-mail,--disable-mail,," +PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,," do_install_append() { install -d "${D}${sysconfdir}/init.d" -- 2.7.4