[oe-commits] Otavio Salvador : rsyslog: move systemd support to rsyslog-systemd
git at git.openembedded.org
git at git.openembedded.org
Fri Dec 23 07:59:19 UTC 2011
Module: meta-openembedded.git
Branch: master
Commit: cb372a589a24f31d2e701350b305dec70cc110e5
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=cb372a589a24f31d2e701350b305dec70cc110e5
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Wed Dec 21 12:05:12 2011 +0000
rsyslog: move systemd support to rsyslog-systemd
This makes the package consistent with others supporting systemd and
also cleans up the recipe using the systemd.bbclass.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
meta-oe/recipes-extended/rsyslog/rsyslog.inc | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog.inc b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
index 856d965..ea7fa22 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog.inc
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog.inc
@@ -4,32 +4,25 @@ HOMEPAGE = "http://www.rsyslog.com/"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=51d9635e646fb75e1b74c074f788e973"
-INC_PR = "r1"
+INC_PR = "r2"
SRC_URI = "http://www.rsyslog.com/files/download/rsyslog/${PN}-${PV}.tar.gz \
file://rsyslog.conf"
-inherit autotools
+inherit autotools systemd
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
do_install_append() {
install -d ${D}/${sysconfdir}/${PN}
install ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
}
+PACKAGES =+ "${PN}-systemd"
-pkg_postinst_${PN} () {
- if test "x$D" != "x"; then
- exit 1
- fi
- systemctl enable rsyslog.service
-}
-
-pkg_prerm_${PN} () {
- systemctl disable rsyslog.service
-}
-
-RRECOMMENDS_${PN} += "systemd"
CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
-FILES_${PN} += "${base_libdir}/systemd"
+FILES_${PN}-systemd += "${base_libdir}/systemd"
+RDEPENDS_${PN}-systemd += "${PN}"
More information about the Openembedded-commits
mailing list