[PATCH 1/2] mosquitto: remove example files from installation

[Nicola Lunghi <nick83ola@gmail.com>]

From: Nicola Lunghi <nicola.lunghi@jci.com>

The mosquitto makefile install a lot of example configuration files
on the image: remove those

also move the creation of /etc/mosquitto into the recipe

Signed-off-by: Nicola Lunghi <nicola.lunghi@jci.com>
---
 ...move-example-files-from-installation.patch | 36 +++++++++++++++++++
 .../mosquitto/mosquitto_1.4.14.bb             |  3 ++
 2 files changed, 39 insertions(+)
 create mode 100644 meta-networking/recipes-connectivity/mosquitto/files/0003-makefile-remove-example-files-from-installation.patch

diff --git a/meta-networking/recipes-connectivity/mosquitto/files/0003-makefile-remove-example-files-from-installation.patch b/meta-networking/recipes-connectivity/mosquitto/files/0003-makefile-remove-example-files-from-installation.patch
new file mode 100644
index 0000000000..ebe9044523
--- /dev/null
+++ b/meta-networking/recipes-connectivity/mosquitto/files/0003-makefile-remove-example-files-from-installation.patch
@@ -0,0 +1,36 @@
+From 79627479a30a96ed2326b680eb575306b621eeb9 Mon Sep 17 00:00:00 2001
+From: Nicola Lunghi <nicola.lunghi@jci.com>
+Date: Fri, 1 Jun 2018 11:11:45 +0100
+Subject: [PATCH] Makefile: remove example files from installation
+
+also remove /etc/mosquitto directory
+---
+ Makefile | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1fc0805..76f81b1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,18 +39,9 @@ install : mosquitto
+ ifeq ($(WITH_DOCS),yes)
+ 	set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} install; done
+ endif
+-	$(INSTALL) -d ${DESTDIR}/etc/mosquitto
+-	$(INSTALL) -m 644 mosquitto.conf ${DESTDIR}/etc/mosquitto/mosquitto.conf.example
+-	$(INSTALL) -m 644 aclfile.example ${DESTDIR}/etc/mosquitto/aclfile.example
+-	$(INSTALL) -m 644 pwfile.example ${DESTDIR}/etc/mosquitto/pwfile.example
+-	$(INSTALL) -m 644 pskfile.example ${DESTDIR}/etc/mosquitto/pskfile.example
+ 
+ uninstall :
+ 	set -e; for d in ${DIRS}; do $(MAKE) -C $${d} uninstall; done
+-	rm -f ${DESTDIR}/etc/mosquitto/mosquitto.conf
+-	rm -f ${DESTDIR}/etc/mosquitto/aclfile.example
+-	rm -f ${DESTDIR}/etc/mosquitto/pwfile.example
+-	rm -f ${DESTDIR}/etc/mosquitto/pskfile.example
+ 
+ dist : reallyclean
+ 	set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
+-- 
+2.17.0
+
diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb
index 13ce3811d4..ea76c36e61 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb
@@ -13,6 +13,7 @@ DEPENDS = "uthash"
 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-makefile-remove-example-files-from-installation.patch \
            file://mosquitto.service \
            file://mosquitto.init \
 "
@@ -47,6 +48,8 @@ do_install() {
     install -d ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/mosquitto.service ${D}${systemd_unitdir}/system/
 
+    install -d ${D}${sysconfdir}/mosquitto
+
     install -d ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto
     sed -i -e 's,@SBINDIR@,${sbindir},g' \
-- 
2.17.0