summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-12-05 08:45:38 -0500
committerKhem Raj <raj.khem@gmail.com>2018-12-05 10:18:59 -0800
commit030e8d445ad3601e6b4f59f951f6f9fe1d9341a2 (patch)
treeb9b1f39b8ba78f86f7bc978f82793f560e371655
parentf2e848c23efff76110d0083b575ea30fc59e9c12 (diff)
downloadmeta-openembedded-030e8d445ad3601e6b4f59f951f6f9fe1d9341a2.tar.gz
rsyslog: curl-less build with fmhttp PACKAGECONFIG
With all other configure options at their defaults, the dependency on libcurl can be removed if fmhttp is configured out. Add an fmhttp PACKAGECONFIG, still enabled by default, to enable this. Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb
index fbdf2818c..1fb439015 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.37.0.bb
@@ -9,7 +9,7 @@ Rsyslog is an enhanced syslogd supporting, among others, MySQL,\
9 encryption protected syslog relay chains while at the same time being\ 9 encryption protected syslog relay chains while at the same time being\
10 very easy to setup for the novice user." 10 very easy to setup for the novice user."
11 11
12DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging curl" 12DEPENDS = "zlib libestr libfastjson bison-native flex-native liblogging"
13HOMEPAGE = "http://www.rsyslog.com/" 13HOMEPAGE = "http://www.rsyslog.com/"
14LICENSE = "GPLv3 & LGPLv3 & Apache-2.0" 14LICENSE = "GPLv3 & LGPLv3 & Apache-2.0"
15LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \ 15LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973 \
@@ -43,7 +43,7 @@ EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes"
43# first line is default yes in configure 43# first line is default yes in configure
44PACKAGECONFIG ??= " \ 44PACKAGECONFIG ??= " \
45 rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ 45 rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \
46 imdiag gnutls imfile \ 46 fmhttp imdiag gnutls imfile \
47 ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ 47 ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \
48 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ 48 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \
49" 49"
@@ -52,6 +52,7 @@ PACKAGECONFIG ??= " \
52PACKAGECONFIG[relp] = "--enable-relp,--disable-relp,librelp," 52PACKAGECONFIG[relp] = "--enable-relp,--disable-relp,librelp,"
53PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,," 53PACKAGECONFIG[rsyslogd] = "--enable-rsyslogd,--disable-rsyslogd,,"
54PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,," 54PACKAGECONFIG[rsyslogrt] = "--enable-rsyslogrt,--disable-rsyslogrt,,"
55PACKAGECONFIG[fmhttp] = "--enable-fmhttp,--disable-fmhttp,curl,"
55PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,," 56PACKAGECONFIG[inet] = "--enable-inet,--disable-inet,,"
56PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,," 57PACKAGECONFIG[klog] = "--enable-klog,--disable-klog,,"
57PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,," 58PACKAGECONFIG[regexp] = "--enable-regexp,--disable-regexp,,"