[oe-commits] [meta-openembedded] 15/21: rsyslog: install logrotate configuration file into correct location

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 84c2374dca0b46acd7f2184a229f266ad4b94ccd
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Fri Aug 18 11:05:27 2017 +0800

    rsyslog: install logrotate configuration file into correct location
    
    Previously we used update-alternatives to manage this configuration file,
    creating link under /etc/logrotate.d/ directory.
    
    However, we later dropped the update-alternatives approach and explicitly
    setting rsyslog to conflict with other syslog providers.
    
    So we need to install the logrotate configuration file under /etc/logrotate.d
    to make things right.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb
index 6e3a75c..bd317be 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.22.0.bb
@@ -119,9 +119,10 @@ do_install_ptest() {
 
 do_install_append() {
     install -d "${D}${sysconfdir}/init.d"
+    install -d "${D}${sysconfdir}/logrotate.d"
     install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog
     install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
-    install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog
+    install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
 }
 
 FILES_${PN} += "${bindir}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.