| Submitter | Otavio Salvador |
|---|---|
| Date | Dec. 22, 2011, 1:08 p.m. |
| Message ID | <06703197a0e4b89243cacc36ac59cdb88992b9ca.1324559278.git.otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/17491/ |
| State | Accepted |
| Commit | cb372a589a24f31d2e701350b305dec70cc110e5 |
| Headers | show |
Comments
On Thu, Dec 22, 2011 at 01:08:23PM +0000, Otavio Salvador wrote: > This makes the package consistent with others supporting systemd and > also cleans up the recipe using the systemd.bbclass. Do you have similar change for xserver-nodm-init? to make it even more consistent? :) Cheers, > > Signed-off-by: Otavio Salvador <otavio@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}" > -- > 1.7.2.5 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
On Thu, Dec 22, 2011 at 11:19, Martin Jansa <martin.jansa@gmail.com> wrote: > On Thu, Dec 22, 2011 at 01:08:23PM +0000, Otavio Salvador wrote: > > This makes the package consistent with others supporting systemd and > > also cleans up the recipe using the systemd.bbclass. > > Do you have similar change for xserver-nodm-init? to make it even more > consistent? :) > Not now but can cook one for later :-) if you can help doing that, it would be nice.
Patch
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}"
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@ossystems.com.br> --- meta-oe/recipes-extended/rsyslog/rsyslog.inc | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-)