| Message ID | 20220829171415.129914-2-marcus.hoffmann@othermo.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [next,v2,1/2] package/python-paho-mqtt: bump to 1.6.1 | expand |
Marcus, All, On 2022-08-29 19:14 +0200, Marcus Hoffmann spake thusly: > We need to switch to the github download as the sdist published to pypi > doesn't package the epl-v20 license file isn't included there: > > https://github.com/eclipse/paho.mqtt.python/pull/635 > > License changed to EPL-2.0 or EDLv1.0 The LICENSE.txt file read *and*, not _or_, so I fixed that in the commit log, and in the .mk [0] > Changelog: > https://github.com/eclipse/paho.mqtt.python/blob/master/ChangeLog.txt > Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de> > --- > Changes v1 -> v2: > - switch to github download to have license file in source tarball > - update license hashes > > package/python-paho-mqtt/python-paho-mqtt.hash | 10 +++++----- > package/python-paho-mqtt/python-paho-mqtt.mk | 9 ++++----- > 2 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/package/python-paho-mqtt/python-paho-mqtt.hash b/package/python-paho-mqtt/python-paho-mqtt.hash > index bf3993e919..dbf9ee89f6 100644 > --- a/package/python-paho-mqtt/python-paho-mqtt.hash > +++ b/package/python-paho-mqtt/python-paho-mqtt.hash > @@ -1,6 +1,6 @@ > -# md5 from https://pypi.python.org/pypi/paho-mqtt/json, sha256 locally computed > -md5 e3ac29cd5dc247a01083a2a8f3fddd08 paho-mqtt-1.4.0.tar.gz > -sha256 e440a052b46d222e184be3be38676378722072fcd4dfd2c8f509fb861a7b0b79 paho-mqtt-1.4.0.tar.gz > -sha256 76f13729e84e9222e543303df00f87d1b2c0995b6a505cd859a285667e44babb LICENSE.txt > +# locally computed > +md5 00c3381d7deacc7ac8b220f3b9d689c6 python-paho-mqtt-1.6.1.tar.gz md5 is weak, we only keep one when supplied by upstream, but we do not add locally computed ones [1], so I dropped it. [1] https://nightly.buildroot.org/manual.html#adding-packages-hash > +sha256 6e35c1be242a901fc9c00bad7d37b5cc4a497f398dfceb4ed0d8018a959be650 python-paho-mqtt-1.6.1.tar.gz > +sha256 66408b049249c3bdb0ba1ed285f5422ce67e371d40151bebd4d806af454ffe7c LICENSE.txt Fields are supposed to be separated by two spaces, not a TAB (though that is supported for historical reasons). > sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 > -sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-v10 > +sha256 8c349f80764d0648e645f41ef23772a70c995a0924b5235f735f4a3d09df127c epl-v20 > diff --git a/package/python-paho-mqtt/python-paho-mqtt.mk b/package/python-paho-mqtt/python-paho-mqtt.mk > index d192749e1e..3ff5f9e57a 100644 > --- a/package/python-paho-mqtt/python-paho-mqtt.mk > +++ b/package/python-paho-mqtt/python-paho-mqtt.mk > @@ -4,11 +4,10 @@ > # > ################################################################################ > > -PYTHON_PAHO_MQTT_VERSION = 1.4.0 > -PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz > -PYTHON_PAHO_MQTT_SITE = https://files.pythonhosted.org/packages/25/63/db25e62979c2a716a74950c9ed658dce431b5cb01fde29eb6cba9489a904 > -PYTHON_PAHO_MQTT_LICENSE = EPL-1.0 or EDLv1.0 > -PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10 > +PYTHON_PAHO_MQTT_VERSION = 1.6.1 > +PYTHON_PAHO_MQTT_SITE = $(call github,eclipse,paho.mqtt.python,v$(PYTHON_PAHO_MQTT_VERSION)) > +PYTHON_PAHO_MQTT_LICENSE = EPL-2.0 or EDLv1.0 [0] here, I changed to: EPL-2.0, EDLv1.0 Applied to next with the above fixes, thanks. Regards, Yann E. MORIN. > +PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 > PYTHON_PAHO_MQTT_SETUP_TYPE = setuptools > > $(eval $(python-package)) > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/python-paho-mqtt/python-paho-mqtt.hash b/package/python-paho-mqtt/python-paho-mqtt.hash index bf3993e919..dbf9ee89f6 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.hash +++ b/package/python-paho-mqtt/python-paho-mqtt.hash @@ -1,6 +1,6 @@ -# md5 from https://pypi.python.org/pypi/paho-mqtt/json, sha256 locally computed -md5 e3ac29cd5dc247a01083a2a8f3fddd08 paho-mqtt-1.4.0.tar.gz -sha256 e440a052b46d222e184be3be38676378722072fcd4dfd2c8f509fb861a7b0b79 paho-mqtt-1.4.0.tar.gz -sha256 76f13729e84e9222e543303df00f87d1b2c0995b6a505cd859a285667e44babb LICENSE.txt +# locally computed +md5 00c3381d7deacc7ac8b220f3b9d689c6 python-paho-mqtt-1.6.1.tar.gz +sha256 6e35c1be242a901fc9c00bad7d37b5cc4a497f398dfceb4ed0d8018a959be650 python-paho-mqtt-1.6.1.tar.gz +sha256 66408b049249c3bdb0ba1ed285f5422ce67e371d40151bebd4d806af454ffe7c LICENSE.txt sha256 e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c edl-v10 -sha256 3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c epl-v10 +sha256 8c349f80764d0648e645f41ef23772a70c995a0924b5235f735f4a3d09df127c epl-v20 diff --git a/package/python-paho-mqtt/python-paho-mqtt.mk b/package/python-paho-mqtt/python-paho-mqtt.mk index d192749e1e..3ff5f9e57a 100644 --- a/package/python-paho-mqtt/python-paho-mqtt.mk +++ b/package/python-paho-mqtt/python-paho-mqtt.mk @@ -4,11 +4,10 @@ # ################################################################################ -PYTHON_PAHO_MQTT_VERSION = 1.4.0 -PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz -PYTHON_PAHO_MQTT_SITE = https://files.pythonhosted.org/packages/25/63/db25e62979c2a716a74950c9ed658dce431b5cb01fde29eb6cba9489a904 -PYTHON_PAHO_MQTT_LICENSE = EPL-1.0 or EDLv1.0 -PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10 +PYTHON_PAHO_MQTT_VERSION = 1.6.1 +PYTHON_PAHO_MQTT_SITE = $(call github,eclipse,paho.mqtt.python,v$(PYTHON_PAHO_MQTT_VERSION)) +PYTHON_PAHO_MQTT_LICENSE = EPL-2.0 or EDLv1.0 +PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10 PYTHON_PAHO_MQTT_SETUP_TYPE = setuptools $(eval $(python-package))
We need to switch to the github download as the sdist published to pypi doesn't package the epl-v20 license file isn't included there: https://github.com/eclipse/paho.mqtt.python/pull/635 License changed to EPL-2.0 or EDLv1.0 Changelog: https://github.com/eclipse/paho.mqtt.python/blob/master/ChangeLog.txt Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de> --- Changes v1 -> v2: - switch to github download to have license file in source tarball - update license hashes package/python-paho-mqtt/python-paho-mqtt.hash | 10 +++++----- package/python-paho-mqtt/python-paho-mqtt.mk | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-)