From 1e62b706ce335194680782b4e5f200a0123718fe Mon Sep 17 00:00:00 2001 From: Nicola Lunghi Date: Fri, 25 May 2018 14:20:08 +0100 Subject: [PATCH 1/3] mosquitto: remove example files from installation The mosquitto makefile install a lot of example configuration files on the image: remove those Change-Id: I4d8af864f955ea5dc34a34ff11a7d3013aefbeda Signed-off-by: Nicola Lunghi --- .../files/0003-remove-example-files.patch | 35 +++++++++++++++++++ .../mosquitto/mosquitto_1.4.14.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-oe/recipes-connectivity/mosquitto/files/0003-remove-example-files.patch diff --git a/meta-oe/recipes-connectivity/mosquitto/files/0003-remove-example-files.patch b/meta-oe/recipes-connectivity/mosquitto/files/0003-remove-example-files.patch new file mode 100644 index 000000000..a5566a074 --- /dev/null +++ b/meta-oe/recipes-connectivity/mosquitto/files/0003-remove-example-files.patch @@ -0,0 +1,35 @@ +From f0e97c16fe0d49f61e5da0aa884f4f7d5a911e90 Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi +Date: Mon, 26 Mar 2018 12:21:43 +0100 +Subject: [PATCH] removed example files + +--- + 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.14.1 + 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 13ce3811d..76eb79b9f 100644 --- a/meta-oe/recipes-connectivity/mosquitto/mosquitto_1.4.14.bb +++ b/meta-oe/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-remove-example-files.patch \ file://mosquitto.service \ file://mosquitto.init \ " -- 2.17.0