diff options
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 8e53689538..ff6d9d26a9 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc | |||
@@ -73,26 +73,26 @@ do_configure_prepend() { | |||
73 | } | 73 | } |
74 | 74 | ||
75 | do_install_append() { | 75 | do_install_append() { |
76 | install -d ${D}/${sysconfdir}/${BPN} | 76 | install -d ${D}${sysconfdir}/${BPN} |
77 | install -d ${D}/${sysconfdir}/init.d | 77 | install -d ${D}${sysconfdir}/init.d |
78 | install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog | 78 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog |
79 | 79 | ||
80 | install -d ${D}/${sysconfdir}/default/volatiles/ | 80 | install -d ${D}${sysconfdir}/default/volatiles/ |
81 | install -m 755 ${WORKDIR}/volatiles.03_syslog-ng ${D}/${sysconfdir}/default/volatiles/03_syslog-ng | 81 | install -m 644 ${WORKDIR}/volatiles.03_syslog-ng ${D}${sysconfdir}/default/volatiles/03_syslog-ng |
82 | install -d ${D}/${sysconfdir}/tmpfiles.d/ | 82 | install -d ${D}${sysconfdir}/tmpfiles.d/ |
83 | install -m 755 ${WORKDIR}/syslog-ng-tmp.conf ${D}/${sysconfdir}/tmpfiles.d/syslog-ng.conf | 83 | install -m 644 ${WORKDIR}/syslog-ng-tmp.conf ${D}${sysconfdir}/tmpfiles.d/syslog-ng.conf |
84 | 84 | ||
85 | install -d ${D}/${localstatedir}/lib/${BPN} | 85 | install -d ${D}${localstatedir}/lib/${BPN} |
86 | # Remove /var/run as it is created on startup | 86 | # Remove /var/run as it is created on startup |
87 | rm -rf ${D}${localstatedir}/run | 87 | rm -rf ${D}${localstatedir}/run |
88 | 88 | ||
89 | # support for systemd | 89 | # support for systemd |
90 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 90 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
91 | install ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf | 91 | install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf |
92 | 92 | ||
93 | install -d ${D}${systemd_unitdir}/system/ | 93 | install -d ${D}${systemd_unitdir}/system/ |
94 | install -m 0644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service | 94 | install -m 644 ${S}/contrib/systemd/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service |
95 | install -m 0644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default | 95 | install -m 644 ${S}/contrib/systemd/${BPN}@default ${D}${sysconfdir}/default/${BPN}@default |
96 | 96 | ||
97 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default | 97 | sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default |
98 | sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default | 98 | sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${systemd_unitdir}/system/${BPN}@.service ${D}${sysconfdir}/default/${BPN}@default |
@@ -101,7 +101,7 @@ do_install_append() { | |||
101 | install -d ${D}${systemd_unitdir}/system/multi-user.target.wants | 101 | install -d ${D}${systemd_unitdir}/system/multi-user.target.wants |
102 | ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service | 102 | ln -sf ../${BPN}@.service ${D}${systemd_unitdir}/system/multi-user.target.wants/${BPN}@default.service |
103 | else | 103 | else |
104 | install ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf | 104 | install -m 644 ${WORKDIR}/syslog-ng.conf.sysvinit ${D}${sysconfdir}/${BPN}/${BPN}.conf |
105 | fi | 105 | fi |
106 | 106 | ||
107 | oe_multilib_header syslog-ng/syslog-ng-config.h | 107 | oe_multilib_header syslog-ng/syslog-ng-config.h |