[meta-networking][thud][PATCH 1/2] mosquitto: fix build in systemd environments

[meta-networking][thud][PATCH 1/2] mosquitto: fix build in systemd environments

[Damien Riegel]

From: André Draszik <andre.draszik@jci.com>

The mosquitto systemd service file instructs systemd to wait
for mosquitto to notify systemd that mosquitto has started
correctly. This isn't working as mosquitto is not *compiled*
with systemd support enabled. As such, systemd restarts
mosquitto every few seconds.

For reference, this was introduced in commit a483d344d9fb
("mosquitto: Make enabling systemd also enable build dep on systemd")

Because we build mosquitto using the provided Makefile
infrastructure, the solution is to add PACKAGECONFIG_CONFARGS
to EXTRA_OEMAKE, so that the required make flags are added
to the make command line.

Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Damien Riegel <damien.riegel@gmail.com>
[Damien Riegel: backport from master]
---

This is a backport from master. Patch has been modified to apply cleanly
on the mosquitto_1.5.1.bb recipe.

 .../recipes-connectivity/mosquitto/mosquitto_1.5.1.bb            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb
index b4adfdada..52252787d 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb
@@ -38,6 +38,7 @@ EXTRA_OEMAKE = " \
     ${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes', 'WITH_UUID=no', d)} \
     ${@bb.utils.contains('PACKAGECONFIG', 'websockets', 'WITH_WEBSOCKETS=yes', 'WITH_WEBSOCKETS=no', d)} \
+    ${PACKAGECONFIG_CONFARGS} \
     STRIP=/bin/true \
     WITH_DOCS=no \
 "
-- 
2.21.0

[meta-networking][thud][PATCH 2/2] mosquitto: fully switch over to using PACKAGECONFIG_CONFARGS

[Damien Riegel]

From: André Draszik <andre.draszik@jci.com>

Convert all other instances of explicit PACKAGECONFIG uses
to the PACKAGECONFIG_CONFARGS infrastructure.

Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Damien Riegel <damien.riegel@gmail.com>
[Damien Riegel: backport from master]
---
 .../mosquitto/mosquitto_1.5.1.bb                     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb
index 52252787d..06c1d67da 100644
--- a/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb
+++ b/meta-networking/recipes-connectivity/mosquitto/mosquitto_1.5.1.bb
@@ -24,20 +24,16 @@ PACKAGECONFIG ??= "ssl uuid \
                   ${@bb.utils.filter('DISTRO_FEATURES','systemd', d)} \
                   "
 
-PACKAGECONFIG[dns-srv] = ",,c-ares"
-PACKAGECONFIG[ssl] = ",,openssl"
-PACKAGECONFIG[uuid] = ",,util-linux"
+PACKAGECONFIG[dns-srv] = "WITH_SRV=yes,WITH_SRV=no,c-ares"
+PACKAGECONFIG[ssl] = "WITH_TLS=yes WITH_TLS_PSK=yes,WITH_TLS=no WITH_TLS_PSK=no,openssl"
+PACKAGECONFIG[uuid] = "WITH_UUID=yes,WITH_UUID=no,util-linux"
 PACKAGECONFIG[systemd] = "WITH_SYSTEMD=yes,WITH_SYSTEMD=no,systemd"
-PACKAGECONFIG[websockets] = ",,libwebsockets"
+PACKAGECONFIG[websockets] = "WITH_WEBSOCKETS=yes,WITH_WEBSOCKETS=no,libwebsockets"
 
 EXTRA_OEMAKE = " \
     prefix=${prefix} \
     mandir=${mandir} \
     localedir=${localedir} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'dns-srv', 'WITH_SRV=yes', 'WITH_SRV=no', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'ssl', 'WITH_TLS=yes WITH_TLS_PSK=yes', 'WITH_TLS=no WITH_TLS_PSK=no', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'uuid', 'WITH_UUID=yes', 'WITH_UUID=no', d)} \
-    ${@bb.utils.contains('PACKAGECONFIG', 'websockets', 'WITH_WEBSOCKETS=yes', 'WITH_WEBSOCKETS=no', d)} \
     ${PACKAGECONFIG_CONFARGS} \
     STRIP=/bin/true \
     WITH_DOCS=no \
-- 
2.21.0

Re: [meta-networking][thud][PATCH 1/2] mosquitto: fix build in systemd environments

[Damien Riegel]

On Thu, 7 Mar 2019 at 16:11, Damien Riegel <damien.riegel@gmail.com> wrote:
>
> From: André Draszik <andre.draszik@jci.com>
>
> The mosquitto systemd service file instructs systemd to wait
> for mosquitto to notify systemd that mosquitto has started
> correctly. This isn't working as mosquitto is not *compiled*
> with systemd support enabled. As such, systemd restarts
> mosquitto every few seconds.
>
> For reference, this was introduced in commit a483d344d9fb
> ("mosquitto: Make enabling systemd also enable build dep on systemd")
>
> Because we build mosquitto using the provided Makefile
> infrastructure, the solution is to add PACKAGECONFIG_CONFARGS
> to EXTRA_OEMAKE, so that the required make flags are added
> to the make command line.
>
> Signed-off-by: André Draszik <andre.draszik@jci.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Signed-off-by: Damien Riegel <damien.riegel@gmail.com>
> [Damien Riegel: backport from master]

Armin, did you get a chance to take a look at these backport patches?

Thank you,
-- 
Damien

Re: [meta-networking][thud][PATCH 1/2] mosquitto: fix build in systemd environments

[akuster808]

On 3/22/19 12:55 PM, Damien Riegel wrote:
> On Thu, 7 Mar 2019 at 16:11, Damien Riegel <damien.riegel@gmail.com> wrote:
>> From: André Draszik <andre.draszik@jci.com>
>>
>> The mosquitto systemd service file instructs systemd to wait
>> for mosquitto to notify systemd that mosquitto has started
>> correctly. This isn't working as mosquitto is not *compiled*
>> with systemd support enabled. As such, systemd restarts
>> mosquitto every few seconds.
>>
>> For reference, this was introduced in commit a483d344d9fb
>> ("mosquitto: Make enabling systemd also enable build dep on systemd")
>>
>> Because we build mosquitto using the provided Makefile
>> infrastructure, the solution is to add PACKAGECONFIG_CONFARGS
>> to EXTRA_OEMAKE, so that the required make flags are added
>> to the make command line.
>>
>> Signed-off-by: André Draszik <andre.draszik@jci.com>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Signed-off-by: Damien Riegel <damien.riegel@gmail.com>
>> [Damien Riegel: backport from master]
> Armin, did you get a chance to take a look at these backport patches?
Yes, i did.
https://git.openembedded.org/meta-openembedded-contrib/log/?h=stable/thud-nmut

should be moving them to thud-next shortly

- armin
>
> Thank you,