mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries
@ 2022-12-27  7:03 Robert Schwebel
  2022-12-27  7:03 ` [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12 Robert Schwebel
  2023-01-02 10:49 ` [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries Michael Olbrich
  0 siblings, 2 replies; 5+ messages in thread
From: Robert Schwebel @ 2022-12-27  7:03 UTC (permalink / raw)
  To: ptxdist; +Cc: Robert Schwebel

The build system creates a client library (c) and an async library (a),
both in a non-SSL and SSL variant. Let's install all of them, as we
don't know which ones are needed.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/paho-mqtt-c.make | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
index 8e229cfe2..143433128 100644
--- a/rules/paho-mqtt-c.make
+++ b/rules/paho-mqtt-c.make
@@ -51,7 +51,14 @@ $(STATEDIR)/paho-mqtt-c.targetinstall:
 	@$(call install_fixup, paho-mqtt-c,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, paho-mqtt-c,DESCRIPTION,missing)
 
+	# async library without ssh
+	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3a)
+	# async library with ssh
 	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3as)
+	# client library without ssl
+	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3c)
+	# client library with ssl
+	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3cs)
 
 	@$(call install_finish, paho-mqtt-c)
 
-- 
2.30.2




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12
  2022-12-27  7:03 [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries Robert Schwebel
@ 2022-12-27  7:03 ` Robert Schwebel
  2023-01-02 10:50   ` Michael Olbrich
  2023-01-02 10:49 ` [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries Michael Olbrich
  1 sibling, 1 reply; 5+ messages in thread
From: Robert Schwebel @ 2022-12-27  7:03 UTC (permalink / raw)
  To: ptxdist; +Cc: Robert Schwebel

The license has changed from EPL-1.0 to EPL-2.0.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/paho-mqtt-c.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
index 143433128..3fbcd7d57 100644
--- a/rules/paho-mqtt-c.make
+++ b/rules/paho-mqtt-c.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PAHO_MQTT_C) += paho-mqtt-c
 #
 # Paths and names
 #
-PAHO_MQTT_C_VERSION	:= 1.3.0
-PAHO_MQTT_C_MD5		:= 8fac1bff9b0d5a74fa1caf8db0501fca
+PAHO_MQTT_C_VERSION	:= 1.3.12
+PAHO_MQTT_C_MD5		:= ca0c3666cf91dcb8e7e65de9e502bf0a
 PAHO_MQTT_C		:= paho.mqtt.c-$(PAHO_MQTT_C_VERSION)
 PAHO_MQTT_C_SUFFIX	:= tar.gz
 PAHO_MQTT_C_URL		:= https://github.com/eclipse/paho.mqtt.c/archive/v$(PAHO_MQTT_C_VERSION).$(PAHO_MQTT_C_SUFFIX)
@@ -24,8 +24,8 @@ PAHO_MQTT_C_DIR		:= $(BUILDDIR)/$(PAHO_MQTT_C)
 # "Eclipse Distribution License - v 1.0" is in fact BSD-3-Clause
 PAHO_MQTT_C_LICENSE	:= EPL-1.0 AND BSD-3-Clause
 PAHO_MQTT_C_LICENSE_FILES := \
-	file://LICENSE;md5=f2001efbb1450daa099206651f80d39c \
-	file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
+	file://LICENSE;md5=fd3b896dadaeec3410d753ffaeadcfac \
+	file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
 	file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3
 
 # ----------------------------------------------------------------------------
-- 
2.30.2




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries
  2022-12-27  7:03 [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries Robert Schwebel
  2022-12-27  7:03 ` [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12 Robert Schwebel
@ 2023-01-02 10:49 ` Michael Olbrich
  1 sibling, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2023-01-02 10:49 UTC (permalink / raw)
  To: Robert Schwebel; +Cc: ptxdist

On Tue, Dec 27, 2022 at 08:03:15AM +0100, Robert Schwebel wrote:
> The build system creates a client library (c) and an async library (a),
> both in a non-SSL and SSL variant. Let's install all of them, as we
> don't know which ones are needed.
> 
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  rules/paho-mqtt-c.make | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
> index 8e229cfe2..143433128 100644
> --- a/rules/paho-mqtt-c.make
> +++ b/rules/paho-mqtt-c.make
> @@ -51,7 +51,14 @@ $(STATEDIR)/paho-mqtt-c.targetinstall:
>  	@$(call install_fixup, paho-mqtt-c,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
>  	@$(call install_fixup, paho-mqtt-c,DESCRIPTION,missing)
>  
> +	# async library without ssh

This is a shell comment and not a make comment and it shows up in the log
at an unexpected time because install_lib just collects the command that is
executed in install_finish.

Make it a make comment with:

#	# async library without ssh

Same for the others.

Michael

> +	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3a)
> +	# async library with ssh
>  	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3as)
> +	# client library without ssl
> +	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3c)
> +	# client library with ssl
> +	@$(call install_lib, paho-mqtt-c, 0, 0, 0644, libpaho-mqtt3cs)
>  
>  	@$(call install_finish, paho-mqtt-c)
>  
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12
  2022-12-27  7:03 ` [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12 Robert Schwebel
@ 2023-01-02 10:50   ` Michael Olbrich
  2023-01-02 11:04     ` Robert Schwebel
  0 siblings, 1 reply; 5+ messages in thread
From: Michael Olbrich @ 2023-01-02 10:50 UTC (permalink / raw)
  To: Robert Schwebel; +Cc: ptxdist

On Tue, Dec 27, 2022 at 08:03:16AM +0100, Robert Schwebel wrote:
> The license has changed from EPL-1.0 to EPL-2.0.

A different License means...

> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> ---
>  rules/paho-mqtt-c.make | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
> index 143433128..3fbcd7d57 100644
> --- a/rules/paho-mqtt-c.make
> +++ b/rules/paho-mqtt-c.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PAHO_MQTT_C) += paho-mqtt-c
>  #
>  # Paths and names
>  #
> -PAHO_MQTT_C_VERSION	:= 1.3.0
> -PAHO_MQTT_C_MD5		:= 8fac1bff9b0d5a74fa1caf8db0501fca
> +PAHO_MQTT_C_VERSION	:= 1.3.12
> +PAHO_MQTT_C_MD5		:= ca0c3666cf91dcb8e7e65de9e502bf0a
>  PAHO_MQTT_C		:= paho.mqtt.c-$(PAHO_MQTT_C_VERSION)
>  PAHO_MQTT_C_SUFFIX	:= tar.gz
>  PAHO_MQTT_C_URL		:= https://github.com/eclipse/paho.mqtt.c/archive/v$(PAHO_MQTT_C_VERSION).$(PAHO_MQTT_C_SUFFIX)
> @@ -24,8 +24,8 @@ PAHO_MQTT_C_DIR		:= $(BUILDDIR)/$(PAHO_MQTT_C)
>  # "Eclipse Distribution License - v 1.0" is in fact BSD-3-Clause
>  PAHO_MQTT_C_LICENSE	:= EPL-1.0 AND BSD-3-Clause

... that this should be changed as well, right?

Michael

>  PAHO_MQTT_C_LICENSE_FILES := \
> -	file://LICENSE;md5=f2001efbb1450daa099206651f80d39c \
> -	file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
> +	file://LICENSE;md5=fd3b896dadaeec3410d753ffaeadcfac \
> +	file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
>  	file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3
>  
>  # ----------------------------------------------------------------------------
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12
  2023-01-02 10:50   ` Michael Olbrich
@ 2023-01-02 11:04     ` Robert Schwebel
  0 siblings, 0 replies; 5+ messages in thread
From: Robert Schwebel @ 2023-01-02 11:04 UTC (permalink / raw)
  To: ptxdist

On Mon, Jan 02, 2023 at 11:50:26AM +0100, Michael Olbrich wrote:
> On Tue, Dec 27, 2022 at 08:03:16AM +0100, Robert Schwebel wrote:
> > The license has changed from EPL-1.0 to EPL-2.0.
> 
> A different License means...
> 
> > Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> > ---
> >  rules/paho-mqtt-c.make | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/rules/paho-mqtt-c.make b/rules/paho-mqtt-c.make
> > index 143433128..3fbcd7d57 100644
> > --- a/rules/paho-mqtt-c.make
> > +++ b/rules/paho-mqtt-c.make
> > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PAHO_MQTT_C) += paho-mqtt-c
> >  #
> >  # Paths and names
> >  #
> > -PAHO_MQTT_C_VERSION	:= 1.3.0
> > -PAHO_MQTT_C_MD5		:= 8fac1bff9b0d5a74fa1caf8db0501fca
> > +PAHO_MQTT_C_VERSION	:= 1.3.12
> > +PAHO_MQTT_C_MD5		:= ca0c3666cf91dcb8e7e65de9e502bf0a
> >  PAHO_MQTT_C		:= paho.mqtt.c-$(PAHO_MQTT_C_VERSION)
> >  PAHO_MQTT_C_SUFFIX	:= tar.gz
> >  PAHO_MQTT_C_URL		:= https://github.com/eclipse/paho.mqtt.c/archive/v$(PAHO_MQTT_C_VERSION).$(PAHO_MQTT_C_SUFFIX)
> > @@ -24,8 +24,8 @@ PAHO_MQTT_C_DIR		:= $(BUILDDIR)/$(PAHO_MQTT_C)
> >  # "Eclipse Distribution License - v 1.0" is in fact BSD-3-Clause
> >  PAHO_MQTT_C_LICENSE	:= EPL-1.0 AND BSD-3-Clause
> 
> ... that this should be changed as well, right?

Uhm, definitely :)

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-01-02 11:04 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-27  7:03 [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries Robert Schwebel
2022-12-27  7:03 ` [ptxdist] [PATCH 2/2] paho-mqtt-c: version bump 1.3.0 -> 1.3.12 Robert Schwebel
2023-01-02 10:50   ` Michael Olbrich
2023-01-02 11:04     ` Robert Schwebel
2023-01-02 10:49 ` [ptxdist] [PATCH 1/2] paho-mqtt-c.make: add missing libraries Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox