diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-08-05 23:18:56 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-11 11:00:42 +0200 |
commit | c0945057ff7dd2562f07bb579032218139397729 (patch) | |
tree | 2d6a078c45dc501600a215a467cbbcdf05e68186 | |
parent | 80310a34807fd952135c11d15fa245b4d39c0e02 (diff) | |
download | meta-openembedded-c0945057ff7dd2562f07bb579032218139397729.tar.gz |
rsyslog: use syslog as the script name of syslog-init
Use syslog as the default symlink and INITSCRIPT_NAME
just as sysklogd and syslog-ng did.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb index 3bb92fab9..6ee571e89 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb | |||
@@ -64,14 +64,14 @@ PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,," | |||
64 | 64 | ||
65 | do_install_append() { | 65 | do_install_append() { |
66 | install -d "${D}${sysconfdir}/init.d" | 66 | install -d "${D}${sysconfdir}/init.d" |
67 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/rsyslogd | 67 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog.${BPN} |
68 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf | 68 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf |
69 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog | 69 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog |
70 | } | 70 | } |
71 | 71 | ||
72 | FILES_${PN} += "${bindir}" | 72 | FILES_${PN} += "${bindir}" |
73 | 73 | ||
74 | INITSCRIPT_NAME = "rsyslogd" | 74 | INITSCRIPT_NAME = "syslog" |
75 | INITSCRIPT_PARAMS = "defaults" | 75 | INITSCRIPT_PARAMS = "defaults" |
76 | 76 | ||
77 | # higher than sysklogd's 100 | 77 | # higher than sysklogd's 100 |
@@ -101,6 +101,5 @@ python () { | |||
101 | pn = d.getVar('PN', True) | 101 | pn = d.getVar('PN', True) |
102 | sysconfdir = d.getVar('sysconfdir', True) | 102 | sysconfdir = d.getVar('sysconfdir', True) |
103 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') | 103 | d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') |
104 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslogd' % (sysconfdir)) | 104 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) |
105 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/rsyslogd' % (sysconfdir)) | ||
106 | } | 105 | } |