diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-08-24 00:45:04 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-08-26 17:32:44 -0700 |
commit | 8a1e2109c63bb296fdaba774347f1a6833608a27 (patch) | |
tree | e106adddaa0bf01ed1a35e37bc3116adc0e53ba4 | |
parent | 523f935691112a2948986d08efaada08539f0cd3 (diff) | |
download | meta-openembedded-8a1e2109c63bb296fdaba774347f1a6833608a27.tar.gz |
rsyslog: Enable openssl transport by default
gnutls is not enabled in librelp and therefore tests fail becasue it
uses openssl but rsyslog uses gnutls,
FAIL: sndrcv_relp_tls_prio.sh
therefore default to using openssl
for both the packages. gnutls can be enabled for both via bbappends but
its not default anymore.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Nicolas Marguet <nicolas.marguet@windriver.com>
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb index c639e81473..41ec191a6e 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2306.0.bb | |||
@@ -47,7 +47,7 @@ EXTRA_OECONF:remove:riscv32 = "ap_cv_atomic_builtins=yes" | |||
47 | # first line is default yes in configure | 47 | # first line is default yes in configure |
48 | PACKAGECONFIG ??= " \ | 48 | PACKAGECONFIG ??= " \ |
49 | rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ | 49 | rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ |
50 | fmhttp imdiag gnutls imfile \ | 50 | fmhttp imdiag openssl imfile \ |
51 | ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ | 51 | ${@bb.utils.filter('DISTRO_FEATURES', 'snmp systemd', d)} \ |
52 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ | 52 | ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench relp ${VALGRIND}', '', d)} \ |
53 | " | 53 | " |
@@ -70,6 +70,7 @@ PACKAGECONFIG[imdiag] = "--enable-imdiag,--disable-imdiag,," | |||
70 | PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," | 70 | PACKAGECONFIG[imfile] = "--enable-imfile,--disable-imfile,," |
71 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," | 71 | PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp," |
72 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," | 72 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls," |
73 | PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl," | ||
73 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," | 74 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd," |
74 | PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," | 75 | PACKAGECONFIG[imjournal] = "--enable-imjournal,--disable-imjournal," |
75 | PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," | 76 | PACKAGECONFIG[mmjsonparse] = "--enable-mmjsonparse,--disable-mmjsonparse," |