summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb')
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
index 63233fd278..186e1ccf24 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.2512.0.bb
@@ -40,6 +40,7 @@ CVE_STATUS[CVE-2015-3243] = "fix-file-included: The shipped default rsyslog.conf
40 40
41inherit autotools pkgconfig systemd update-rc.d ptest 41inherit autotools pkgconfig systemd update-rc.d ptest
42 42
43CACHED_CONFIGUREVARS += "ac_cv_prog_cc_c23=no"
43EXTRA_OECONF += "--enable-imfile-tests ${ATOMICS}" 44EXTRA_OECONF += "--enable-imfile-tests ${ATOMICS}"
44ATOMICS = "ap_cv_atomic_builtins_64=yes ap_cv_atomic_builtins=yes" 45ATOMICS = "ap_cv_atomic_builtins_64=yes ap_cv_atomic_builtins=yes"
45ATOMICS:mipsarch = "" 46ATOMICS:mipsarch = ""
@@ -149,11 +150,11 @@ do_install:append() {
149 sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog 150 sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
150 151
151 if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then 152 if ${@bb.utils.contains('PACKAGECONFIG', 'imjournal', 'true', 'false', d)}; then
152 install -d 0755 ${D}${sysconfdir}/rsyslog.d 153 install -d -m 0755 ${D}${sysconfdir}/rsyslog.d
153 echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf 154 echo '$ModLoad imjournal' >> ${D}${sysconfdir}/rsyslog.d/imjournal.conf
154 fi 155 fi
155 if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then 156 if ${@bb.utils.contains('PACKAGECONFIG', 'mmjsonparse', 'true', 'false', d)}; then
156 install -d 0755 ${D}${sysconfdir}/rsyslog.d 157 install -d -m 0755 ${D}${sysconfdir}/rsyslog.d
157 echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf 158 echo '$ModLoad mmjsonparse' >> ${D}${sysconfdir}/rsyslog.d/mmjsonparse.conf
158 fi 159 fi
159 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 160 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then