diff options
| -rw-r--r-- | meta-oe/recipes-support/syslog-ng/syslog-ng.inc | 9 | ||||
| -rw-r--r-- | meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc index 50ce4a4e2e..584e4a43ee 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7ec1bcc46f28b11f4722e20d9b7dd4d5" # update-rc.d and update-alternatives is important RDEPENDS_${PN} += " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}" -INC_PR = "r8" +INC_PR = "r9" -inherit autotools systemd +inherit autotools SRC_URI = "http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/${PN}_${PV}.tar.gz" @@ -25,8 +25,6 @@ EXTRA_OECONF = " \ --disable-linux-caps \ --disable-pcre \ --disable-sql \ - --enable-systemd \ - --with-systemdsystemunitdir=${systemd_unitdir}/system \ " do_configure_prepend() { @@ -44,9 +42,6 @@ do_install_append() { install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog.${PN} } -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE = "${PN}.service" - FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ ${base_bindir}/* ${base_sbindir}/* \ diff --git a/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend b/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend new file mode 100644 index 0000000000..92c2e77e6c --- /dev/null +++ b/meta-systemd/meta-oe/recipes-support/syslog-ng/syslog-ng_3.2.5.bbappend @@ -0,0 +1,11 @@ +inherit systemd + +PRINC := "${@int(PRINC) + 1}" + +EXTRA_OECONF += " \ + --enable-systemd \ + --with-systemdsystemunitdir=${systemd_unitdir}/system \ +" + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE = "${PN}.service" |