From: Nicola Lunghi <nick83ola@gmail.com>
To: openembedded-devel@lists.openembedded.org
Cc: Nicola Lunghi <nicola.lunghi@jci.com>
Subject: [PATCH 1/2] mosquitto: remove example files from installation
Date: Fri, 1 Jun 2018 11:35:39 +0100 [thread overview]
Message-ID: <20180601103540.13159-1-nick83ola@gmail.com> (raw)
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
next reply other threads:[~2018-06-01 10:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-01 10:35 Nicola Lunghi [this message]
2018-06-01 10:35 ` [PATCH 2/2] mosquitto: add default configuration file Nicola Lunghi
2018-06-01 16:38 ` Khem Raj
[not found] ` <BN6P132MB00836867E5E86FACD60E0972EC660@BN6P132MB0083.NAMP132.PROD.OUTLOOK.COM>
2018-06-05 13:37 ` nick83ola
2018-06-01 16:35 ` [PATCH 1/2] mosquitto: remove example files from installation Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180601103540.13159-1-nick83ola@gmail.com \
--to=nick83ola@gmail.com \
--cc=nicola.lunghi@jci.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox