Skip to contentSkip to conversation

mosquitto: add default configuration file

PATCH In review Nicola Lunghi 3 participants 6 messages Jun 5, 2018 – Jun 11, 2018

lore
Share & tools
lore

Nicola Lunghi

author
#0 lore raw

PATCH 1/2 mosquitto: add default configuration file

From: Nicola Lunghi <[email protected]>

the mosquitto recipe doesn't add a mosquitto configuration file add it from the mosquitto.conf.example file

Signed-off-by Nicola Lunghi <[email protected]>
---
 .../recipes-connectivity/mosquitto/mosquitto_1.4.15.bb      | 6 ++++++
 1 file changed, 6 insertions(+)
meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +6 -0
index 939bad54ea..c71f1e467f 100644
@@ -47,6 +47,10 @@ do_install() {
     install -d ${D}${systemd_unitdir}/system/
     install -m 0644 ${WORKDIR}/mosquitto.service ${D}${systemd_unitdir}/system/
 
+    install -d ${D}${sysconfdir}/mosquitto
+    install -m 0644 ${D}${sysconfdir}/mosquitto/mosquitto.conf.example \
+                    ${D}${sysconfdir}/mosquitto/mosquitto.conf
+
     install -d ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/mosquitto.init ${D}${sysconfdir}/init.d/mosquitto
     sed -i -e 's,@SBINDIR@,${sbindir},g' \

@@ -65,6 +69,8 @@ FILES_${PN} = "${sbindir}/mosquitto \
                ${systemd_unitdir}/system/mosquitto.service \
 "
 
+CONFFILES_${PN} += "${sysconfdir}/mosquitto/mosquitto.conf"
+
 FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1"
 
 FILES_libmosquittopp1 = "${libdir}/libmosquittopp.so.1"
Signature · 1 line
2.17.0
author
#1 lore raw

PATCH 2/2 mosquitto: add mosquitto-examples package

From: Nicola Lunghi <[email protected]>

the mosquitto install populate some .example files in /etc/mosquitto. move thise example files in a separate package

The PACKAGE_BEFORE_PN is needed because otherwise those examples end in the base mosquitto package

Signed-off-by Nicola Lunghi <[email protected]>
---
 .../recipes-connectivity/mosquitto/mosquitto_1.4.15.bb        | 4 ++++
 1 file changed, 4 insertions(+)
meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +4 -0
index c71f1e467f..8dd2124c41 100644
@@ -62,6 +62,8 @@ do_install() {
 
 PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients"
 
+PACKAGE_BEFORE_PN = "${PN}-examples"
+
 FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
                ${sysconfdir}/mosquitto \

@@ -79,6 +81,8 @@ FILES_${PN}-clients = "${bindir}/mosquitto_pub \
                        ${bindir}/mosquitto_sub \
 "
 
+FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example"
+
 SYSTEMD_SERVICE_${PN} = "mosquitto.service"
 
 INITSCRIPT_NAME = "mosquitto"
Signature · 1 line
2.17.0
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] mosquitto: add mosquitto-examples package

Quoted 8 lines · NZST Nicola Lunghi

From: Nicola Lunghi <[email protected]>

the mosquitto install populate some .example files in /etc/mosquitto. move thise example files in a separate package

The PACKAGE_BEFORE_PN is needed because otherwise those examples end in the base mosquitto package

Review

Quoted 6 lines
Signed-off-by Nicola Lunghi <[email protected]>
---
 .../recipes-connectivity/mosquitto/mosquitto_1.4.15.bb        | 4 ++++
 1 file changed, 4 insertions(+)
(quoted diff) +0 -0

mosquitto_1.4.15.bb b/meta-networking/recipes-connectivity/mosquitto/ mosquitto_1.4.15.bb

Quoted 14 lines

index c71f1e467f..8dd2124c41 100644

meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +2 -0
@@ -62,6 +62,8 @@ do_install() {
 
 PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients"
 
+PACKAGE_BEFORE_PN = "${PN}-examples"
+
 FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
                ${sysconfdir}/mosquitto \

meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb FILES_${PN}-clients = "${bindir}/mosquitto_pub \ · line 88

Quoted 8 lines
meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +2 -0
@@ -79,6 +81,8 @@ FILES_${PN}-clients = "${bindir}/mosquitto_pub \
                        ${bindir}/mosquitto_sub \
 "
 
+FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example"
+
 SYSTEMD_SERVICE_${PN} = "mosquitto.service"
 
 INITSCRIPT_NAME = "mosquitto"

Both of these look good to me, FWIW

Acked-by Paul Eggleton <[email protected]>

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
author
#3 lore raw

Re: [PATCH 2/2] mosquitto: add mosquitto-examples package

ping

Quoted 53 lines · Paul Eggleton
Quoted 8 lines · NZST Nicola Lunghi

From: Nicola Lunghi <[email protected]>

the mosquitto install populate some .example files in /etc/mosquitto. move thise example files in a separate package

The PACKAGE_BEFORE_PN is needed because otherwise those examples end in the base mosquitto package

Review

Quoted 6 lines
Signed-off-by Nicola Lunghi <[email protected]>
---
 .../recipes-connectivity/mosquitto/mosquitto_1.4.15.bb        | 4 ++++
 1 file changed, 4 insertions(+)
(quoted diff) +0 -0

mosquitto_1.4.15.bb b/meta-networking/recipes-connectivity/mosquitto/ mosquitto_1.4.15.bb

Quoted 14 lines

index c71f1e467f..8dd2124c41 100644

meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +2 -0
@@ -62,6 +62,8 @@ do_install() {
 
 PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients"
 
+PACKAGE_BEFORE_PN = "${PN}-examples"
+
 FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
                ${sysconfdir}/mosquitto \

meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb FILES_${PN}-clients = "${bindir}/mosquitto_pub \ · line 88

Quoted 8 lines
meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +2 -0
@@ -79,6 +81,8 @@ FILES_${PN}-clients = "${bindir}/mosquitto_pub \
                        ${bindir}/mosquitto_sub \
 "
 
+FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example"
+
 SYSTEMD_SERVICE_${PN} = "mosquitto.service"
 
 INITSCRIPT_NAME = "mosquitto"

Both of these look good to me, FWIW

Acked-by Paul Eggleton <[email protected]>

Cheers,
Paul

--

Paul Eggleton
Intel Open Source Technology Centre

#4 lore raw

Re: [PATCH 2/2] mosquitto: add mosquitto-examples package

they are in master-next

Quoted 61 lines · On Thu, Jun 7, 2018 at 2:32 AM, nick83ola <[email protected]> wrote:

ping

Quoted 44 lines · Paul Eggleton
Quoted 8 lines · NZST Nicola Lunghi

From: Nicola Lunghi <[email protected]>

the mosquitto install populate some .example files in /etc/mosquitto. move thise example files in a separate package

The PACKAGE_BEFORE_PN is needed because otherwise those examples end in the base mosquitto package

Review

Quoted 6 lines
Signed-off-by Nicola Lunghi <[email protected]>
---
 .../recipes-connectivity/mosquitto/mosquitto_1.4.15.bb        | 4 ++++
 1 file changed, 4 insertions(+)
(quoted diff) +0 -0

mosquitto_1.4.15.bb b/meta-networking/recipes-connectivity/mosquitto/ mosquitto_1.4.15.bb

Quoted 14 lines

index c71f1e467f..8dd2124c41 100644

meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +2 -0
@@ -62,6 +62,8 @@ do_install() {
 
 PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients"
 
+PACKAGE_BEFORE_PN = "${PN}-examples"
+
 FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
                ${sysconfdir}/mosquitto \

meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb FILES_${PN}-clients = "${bindir}/mosquitto_pub \ · line 88

Quoted 8 lines
meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +2 -0
@@ -79,6 +81,8 @@ FILES_${PN}-clients = "${bindir}/mosquitto_pub \
                        ${bindir}/mosquitto_sub \
 "
 
+FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example"
+
 SYSTEMD_SERVICE_${PN} = "mosquitto.service"
 
 INITSCRIPT_NAME = "mosquitto"

Both of these look good to me, FWIW

Acked-by Paul Eggleton <[email protected]>
Quoted 9 lines

Cheers,
Paul

--

Paul Eggleton
Intel Open Source Technology Centre

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

author
#5 lore raw

Re: [PATCH 2/2] mosquitto: add mosquitto-examples package

Thanks

:-)

Nicola Lunghi

Quoted 64 lines · Khem Raj

they are in master-next

Quoted 61 lines · On Thu, Jun 7, 2018 at 2:32 AM, nick83ola <[email protected]> wrote:

ping

Quoted 44 lines · Paul Eggleton
Quoted 8 lines · NZST Nicola Lunghi

From: Nicola Lunghi <[email protected]>

the mosquitto install populate some .example files in /etc/mosquitto. move thise example files in a separate package

The PACKAGE_BEFORE_PN is needed because otherwise those examples end in the base mosquitto package

Review

Quoted 6 lines
Signed-off-by Nicola Lunghi <[email protected]>
---
 .../recipes-connectivity/mosquitto/mosquitto_1.4.15.bb        | 4 ++++
 1 file changed, 4 insertions(+)
(quoted diff) +0 -0

mosquitto_1.4.15.bb b/meta-networking/recipes-connectivity/mosquitto/ mosquitto_1.4.15.bb

Quoted 14 lines

index c71f1e467f..8dd2124c41 100644

meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +2 -0
@@ -62,6 +62,8 @@ do_install() {
 
 PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients"
 
+PACKAGE_BEFORE_PN = "${PN}-examples"
+
 FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
                ${sysconfdir}/mosquitto \

meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb FILES_${PN}-clients = "${bindir}/mosquitto_pub \ · line 88

Quoted 8 lines
meta-networking/recipes-connectivity/mosquitto/mosquitto_1.4.15.bb +2 -0
@@ -79,6 +81,8 @@ FILES_${PN}-clients = "${bindir}/mosquitto_pub \
                        ${bindir}/mosquitto_sub \
 "
 
+FILES_${PN}-examples = "${sysconfdir}/mosquitto/*.example"
+
 SYSTEMD_SERVICE_${PN} = "mosquitto.service"
 
 INITSCRIPT_NAME = "mosquitto"

Both of these look good to me, FWIW

Acked-by Paul Eggleton <[email protected]>
Quoted 9 lines

Cheers,
Paul

--

Paul Eggleton
Intel Open Source Technology Centre

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel