From 816446fd199a16948f83263ad7a2e6ff6ff004b1 Mon Sep 17 00:00:00 2001 From: Nicola Lunghi Date: Fri, 25 May 2018 14:34:13 +0100 Subject: [PATCH 3/3] mosquitto_1.4.14: add log file enable logging by default and create the necessary files/folder Change-Id: I68a23e891e5bc928c33634c92d0b9faa8db624aa Signed-off-by: Nicola Lunghi --- .../mosquitto/files/mosquitto-yocto.conf | 1 + .../mosquitto/mosquitto_1.4.14.bb | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto-yocto.conf b/meta-oe/recipes-connectivity/mosquitto/files/mosquitto-yocto.conf index 9b43323f3..a695d5429 100644 --- a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto-yocto.conf +++ b/meta-oe/recipes-connectivity/mosquitto/files/mosquitto-yocto.conf @@ -1,4 +1,5 @@ pid_file @LOCALSTATEDIR@/run/mosquitto.pid +log_dest file @LOCALSTATEDIR@/log/mosquitto/mosquitto.log # Place your local configuration in /etc/mosquitto/conf.d/ include_dir @SYSCONFDIR@/mosquitto/conf.d diff --git a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb b/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb index ce21379f6..5155655c5 100644 --- a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb +++ b/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb @@ -55,6 +55,18 @@ do_install() { # create an empty conf.d directory to make mosquitto happy install -d ${D}${sysconfdir}/mosquitto/conf.d + if [ ${@bb.utils.filter('DISTRO_FEATURES','sysvinit',d)} ]; then + install -d ${D}${sysconfdir}/default/volatiles + echo "d mosquitto mosquitto 0755 ${localstatedir}/log/mosquitto none" \ + > ${D}${sysconfdir}/default/volatiles/10_mosquitto + elif [ ${@bb.utils.filter('DISTRO_FEATURES','systemd',d)} ]; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/log/mosquitto 0755 mosquitto mosquitto -" \ + > ${D}${sysconfdir}/tmpfiles.d/mosquitto.conf + else + bbfatal "could not create mosquitto log directory missing systemd or sysvinit" + fi + install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/mosquitto.service ${D}${systemd_unitdir}/system/ @@ -74,6 +86,8 @@ FILES_${PN} = "${sbindir}/mosquitto \ ${sysconfdir}/mosquitto \ ${sysconfdir}/init.d \ ${systemd_unitdir}/system/mosquitto.service \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${sysconfdir}/tmpfiles.d/mosquitto.conf', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${sysconfdir}/default/volatiles/10_mosquitto', '', d)} \ " CONFFILES_${PN} += "${sysconfdir}/mosquitto" -- 2.17.0