mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

syslog-ng: add volatile directory init for systemd

Browse Source 
systemd requires volatile file/directory specifications to
be in a tmpfiles.d directory.  We put ours in /etc/tmpfiles.d.

Also eliminate SRC_URI duplication in .bb and .inc files.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Slater, Joseph
2019-11-01 11:20:05 -07:00
committed by Khem Raj
parent 5a4ae66242
commit 98853a4f5d
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/syslog-ng/files/syslog-ng-tmp.conf
+1
View File
@@ -0,0 +1 @@
d /var/run/syslog-ng 0755 root root
meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+6
View File
@@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=24c0c5cb2c83d9f2ab725481e4df5240"
# util-linux added to get libuuid # util-linux added to get libuuid
DEPENDS = "libpcre flex glib-2.0 openssl util-linux" DEPENDS = "libpcre flex glib-2.0 openssl util-linux"
# We expect the recipe to add anything specific for that version to these defaults.
#
SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \
file://syslog-ng.conf.systemd \ file://syslog-ng.conf.systemd \
file://syslog-ng.conf.sysvinit \ file://syslog-ng.conf.sysvinit \
@@ -74,8 +76,12 @@ do_install_append() {
install -d ${D}/${sysconfdir}/${BPN} install -d ${D}/${sysconfdir}/${BPN}
install -d ${D}/${sysconfdir}/init.d install -d ${D}/${sysconfdir}/init.d
install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog
install -d ${D}/${sysconfdir}/default/volatiles/ install -d ${D}/${sysconfdir}/default/volatiles/
install -m 755 ${WORKDIR}/volatiles.03_syslog-ng ${D}/${sysconfdir}/default/volatiles/03_syslog-ng install -m 755 ${WORKDIR}/volatiles.03_syslog-ng ${D}/${sysconfdir}/default/volatiles/03_syslog-ng
install -d ${D}/${sysconfdir}/tmpfiles.d/
install -m 755 ${WORKDIR}/syslog-ng-tmp.conf ${D}/${sysconfdir}/tmpfiles.d/syslog-ng.conf
install -d ${D}/${localstatedir}/lib/${BPN} install -d ${D}/${localstatedir}/lib/${BPN}
# Remove /var/run as it is created on startup # Remove /var/run as it is created on startup
rm -rf ${D}${localstatedir}/run rm -rf ${D}${localstatedir}/run
meta-oe/recipes-support/syslog-ng/syslog-ng_3.19.1.bb
+4 -6
View File
@@ -1,15 +1,13 @@
require syslog-ng.inc require syslog-ng.inc
SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ # We only want to add stuff we need to the defaults provided in syslog-ng.inc.
file://syslog-ng.conf.systemd \ #
file://syslog-ng.conf.sysvinit \ SRC_URI += " \
file://initscript \
file://volatiles.03_syslog-ng \
file://configure.ac-add-option-enable-thread-tls-to-manage-.patch \
file://fix-config-libnet.patch \ file://fix-config-libnet.patch \
file://fix-invalid-ownership.patch \ file://fix-invalid-ownership.patch \
file://syslog-ng.service-the-syslog-ng-service.patch \ file://syslog-ng.service-the-syslog-ng-service.patch \
file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \ file://0001-syslog-ng-fix-segment-fault-during-service-start.patch \
file://syslog-ng-tmp.conf \
" "
SRC_URI[md5sum] = "aa79bc13d9fd925aa5fb9516e87aacd3" SRC_URI[md5sum] = "aa79bc13d9fd925aa5fb9516e87aacd3"