From 26e6331d18edf7849776d1937b63074e8017b6cb Mon Sep 17 00:00:00 2001 From: Nicola Lunghi Date: Fri, 25 May 2018 14:32:34 +0100 Subject: [PATCH 2/3] mosquitto_1.4.14: add default configuration file this patch implement the following changes: -add a mosquitto configuration file to the recipe to make simpler to use with bbappends -create a conf.d directory where to puth customized configuration files Change-Id: I2ee2d3c533f53450249de3556925c4b4b2fffda8 Signed-off-by: Nicola Lunghi --- .../mosquitto/files/mosquitto-yocto.conf | 4 ++++ .../mosquitto/mosquitto_1.4.14.bb | 11 +++++++++++ 2 files changed, 15 insertions(+) create mode 100644 meta-oe/recipes-connectivity/mosquitto/files/mosquitto-yocto.conf diff --git a/meta-oe/recipes-connectivity/mosquitto/files/mosquitto-yocto.conf b/meta-oe/recipes-connectivity/mosquitto/files/mosquitto-yocto.conf new file mode 100644 index 000000000..9b43323f3 --- /dev/null +++ b/meta-oe/recipes-connectivity/mosquitto/files/mosquitto-yocto.conf @@ -0,0 +1,4 @@ +pid_file @LOCALSTATEDIR@/run/mosquitto.pid + +# 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 76eb79b9f..ce21379f6 100644 --- a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb +++ b/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb @@ -14,6 +14,7 @@ SRC_URI = "http://mosquitto.org/files/source/mosquitto-${PV}.tar.gz \ file://0001-config.mk-allow-prefix-mandir-localedir-from-environ.patch \ file://0002-uthash-remove-in-tree-version.patch \ file://0003-remove-example-files.patch \ + file://mosquitto-yocto.conf \ file://mosquitto.service \ file://mosquitto.init \ " @@ -45,6 +46,15 @@ do_install() { install -d ${D}${libdir} install -m 0644 lib/libmosquitto.a ${D}${libdir}/ + install -d ${D}${sysconfdir}/mosquitto + install -m 0644 ${WORKDIR}/mosquitto-yocto.conf ${D}${sysconfdir}/mosquitto/mosquitto.conf + sed -i -e 's,@LOCALSTATEDIR@,${localstatedir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${sysconfdir}/mosquitto/mosquitto.conf + + # create an empty conf.d directory to make mosquitto happy + install -d ${D}${sysconfdir}/mosquitto/conf.d + install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/mosquitto.service ${D}${systemd_unitdir}/system/ @@ -65,6 +75,7 @@ FILES_${PN} = "${sbindir}/mosquitto \ ${sysconfdir}/init.d \ ${systemd_unitdir}/system/mosquitto.service \ " +CONFFILES_${PN} += "${sysconfdir}/mosquitto" FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1" -- 2.17.0