Skip to contentSkip to conversation

paho-mqtt-c: Improve the license information

PATCH New Peter Kjellerstedt 1 participant 5 messages Apr 4, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 paho-mqtt-c: Improve the license information

Replace the about.html and notice.html files in LIC_FILES_CHKSUM with the LICENSE file. Including HTML files in LIC_FILES_CHKSUM complicates things when the license files that OE collects are, e.g., later processed and presented to a user where the expectation is that they are plain text files.

---
 meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb +1 -2
index d006ae763..7a65582db 100644
@@ -5,10 +5,9 @@ SECTION = "console/network"
 LICENSE = "EPL-2.0 | EDL-1.0"
 
 LIC_FILES_CHKSUM = " \
+    file://LICENSE;md5=fd3b896dadaeec3410d753ffaeadcfac \
     file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \
     file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
-    file://notice.html;md5=943f861069889acecebf51dfa24478e2 \
-    file://about.html;md5=e5662cbb5f8fd5c9faac526e4077898e \
 "
 
 SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http;branch=master;protocol=https"
#1 lore raw

PATCH 2/5 paho-mqtt-cpp: Improve the license information

Replace the about.html and notice.html files in LIC_FILES_CHKSUM with the license information from one of the source files. Including HTML files in LIC_FILES_CHKSUM complicates things when the license files that OE collects are, e.g., later processed and presented to a user where the expectation is that they are plain text files.

---
 .../recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb +1 -2
index a9e16fa04..d0441b844 100644
@@ -5,10 +5,9 @@ SECTION = "console/network"
 LICENSE = "EPL-1.0 | EDL-1.0"
 
 LIC_FILES_CHKSUM = " \
+    file://src/mqtt/message.h;beginline=9;endline=18;md5=5eec304e6066523386c222963ceeb6ff \
     file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \
     file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
-    file://notice.html;md5=a00d6f9ab542be7babc2d8b80d5d2a4c \
-    file://about.html;md5=dcde438d73cf42393da9d40fabc0c9bc \
 "
 
 SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=http;branch=master;protocol=https \
#2 lore raw

PATCH 3/5 python3-crc32c: Correct the license information

In reply to Peter Kjellerstedt

Correct "startline=" to "beginline=" in LIC_FILES_CHKSUM so that the correct lines from crc32c_adler.c are used.

---
 meta-python/recipes-devtools/python/python3-crc32c_2.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-python/recipes-devtools/python/python3-crc32c_2.3.bb +1 -1
index 203256895..da756ea07 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE;md5=4fbd65380cdd255951079008b364516c \
     file://LICENSE.google-crc32c;md5=e9ed01b5e5ac9eae23fc2bb33701220c \
     file://LICENSE.slice-by-8;md5=6b3bc7709d6b2db6646ec2467310ff6b \
-    file://crc32c_adler.c;startline=9;endline=24;md5=c60e6e55d0e5d95effa6fad27db0711a \
+    file://crc32c_adler.c;beginline=9;endline=24;md5=9c8bd2afd2d340fd37c038759cd4eff8 \
 "
 
 SRC_URI[sha256sum] = "17ce6c596ad0d53df52dcd72defb66984aeabd98fbefea7ba848a6b6bdece36a"
#3 lore raw

PATCH 4/5 autossh: Correct the license information

In reply to Peter Kjellerstedt

Correct "startline=" to "beginline=" in LIC_FILES_CHKSUM so that the correct lines from autossh.c and daemon.h are used. Also remove autossh.spec from LIC_FILES_CHKSUM as it doesn't really contain any license information.

---
 meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta-networking/recipes-connectivity/autossh/autossh_1.4g.bb +2 -3
index 3dc304b23..de7e2d3e0 100644
@@ -2,9 +2,8 @@ DESCRIPTION = "autossh is a program to start a copy of ssh and monitor it, resta
 HOMEPAGE = "https://www.harding.motd.ca/autossh/"
 
 LICENSE = "BSD-1-Clause & BSD-4-Clause"
-LIC_FILES_CHKSUM = "file://autossh.spec;md5=80a6701134723fd3420e733b46a0eb97 \
-                    file://autossh.c;md5=76c37acd40ac45050a4ced145b1e2707;startline=7;endline=23 \
-                    file://daemon.h;md5=6bbeaac616b9bc8de7b40049004f4289;startline=7;endline=39"
+LIC_FILES_CHKSUM = "file://autossh.c;beginline=7;endline=22;md5=9ae0c9b04856148d77984ef58536732b \
+                    file://daemon.h;beginline=7;endline=36;md5=839bb7bf781ff48da4a3fec2a62a1a47"
 
 SRC_URI = "https://www.harding.motd.ca/autossh/${BP}.tgz"
 SRC_URI[md5sum] = "2b804bc1bf6d2f2afaa526d02df7c0a2"
#4 lore raw

PATCH 5/5 recipes: Remove double protocol= from SRC_URIs

In reply to Peter Kjellerstedt

With the exception of paho-mqtt-cpp, the double protocol= attributes were added to the SRC_URIs when protocol=https was added to all SRC_URIs fetching from github.com in commit b402a3076f (recipes: Update SRC_URI branch and protocols).

---
 meta-networking/recipes-support/unbound/unbound_1.17.1.bb       | 2 +-
 meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb  | 2 +-
 .../recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb   | 2 +-
 meta-oe/recipes-core/emlog/emlog.inc                            | 2 +-
 meta-oe/recipes-core/mdbus2/mdbus2_git.bb                       | 2 +-
 meta-oe/recipes-devtools/ltrace/ltrace_git.bb                   | 2 +-
 meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb   | 2 +-
 meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb         | 2 +-
 meta-oe/recipes-extended/mraa/mraa_git.bb                       | 2 +-
 meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb               | 2 +-
 meta-oe/recipes-extended/upm/upm_git.bb                         | 2 +-
 meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb            | 2 +-
 meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb      | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
meta-networking/recipes-support/unbound/unbound_1.17.1.bb +1 -1
index caa1bb339..24ac6012b 100644
@@ -9,7 +9,7 @@ SECTION = "net"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06"
 
-SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=http;branch=master;protocol=https \
+SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \
 	file://0001-contrib-add-yocto-compatible-init-script.patch \
 "
 SRCREV = "90831af981221bbce1cd7b15055562336760e484"
meta-oe/recipes-connectivity/paho-mqtt-c/paho-mqtt-c_1.3.12.bb +1 -1
index 7a65582db..6578bcfeb 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
     file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \
 "
 
-SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=http;branch=master;protocol=https"
+SRC_URI = "git://github.com/eclipse/paho.mqtt.c;protocol=https;branch=master"
 
 SRCREV = "4157a27d39f1dd5b95750ecb6acd1481432785d8"
 
meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.2.0.bb +1 -1
index d0441b844..bb5aa6907 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \
     file://epl-v10;md5=659c8e92a40b6df1d9e3dccf5ae45a08 \
 "
 
-SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=http;branch=master;protocol=https \
+SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=master \
            file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \
 "
 SRCREV = "33921c8b68b351828650c36816e7ecf936764379"
meta-oe/recipes-core/emlog/emlog.inc +1 -1
index 824787083..208b39acd 100644
@@ -3,7 +3,7 @@ most recent (and only the most recent) output from a process"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=http;branch=master;protocol=https"
+SRC_URI = "git://github.com/nicupavel/emlog.git;protocol=https;branch=master"
 SRCREV = "aee53e8dee862f35291242ba41b0ca88010f6c71"
 
 S = "${WORKDIR}/git"
meta-oe/recipes-core/mdbus2/mdbus2_git.bb +1 -1
index 07c5cc939..c6db78b4a 100644
@@ -6,7 +6,7 @@ DEPENDS = "readline"
 
 PV = "2.3.3+git${SRCPV}"
 
-SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=http;branch=master;protocol=https \
+SRC_URI = "git://github.com/freesmartphone/mdbus.git;protocol=https;branch=master \
            file://0001-Fix-arguments-in-GLib.DBusSignalCallback-for-Vala-0..patch \
            "
 SRCREV = "28202692d0b441000f4ddb8f347f72d1355021aa"
meta-oe/recipes-devtools/ltrace/ltrace_git.bb +1 -1
index 976bb482a..d690dd4f0 100644
@@ -14,7 +14,7 @@ PV = "7.91+git${SRCPV}"
 SRCREV = "c22d359433b333937ee3d803450dc41998115685"
 
 DEPENDS = "elfutils"
-SRC_URI = "git://github.com/sparkleholic/ltrace.git;branch=master;protocol=http;protocol=https \
+SRC_URI = "git://github.com/sparkleholic/ltrace.git;protocol=https;branch=master \
            file://configure-allow-to-disable-selinux-support.patch \
            file://0001-replace-readdir_r-with-readdir.patch \
            file://0001-Use-correct-enum-type.patch \
meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.1.bb +1 -1
index 464d25ad0..3b7453536 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b19ee058d2d5f69af45da98051d91064"
 SECTION = "Development/Libraries"
 DEPENDS = "swig-native python3 sblim-cmpi-devel"
 
-SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=http;branch=master;protocol=https \
+SRC_URI = "git://github.com/kkaempf/cmpi-bindings.git;protocol=https;branch=master \
            file://cmpi-bindings-0.4.17-no-ruby-perl.patch \
            file://cmpi-bindings-0.4.17-sblim-sigsegv.patch \
            file://cmpi-bindings-0.9.5-python-lib-dir.patch \
meta-oe/recipes-extended/jpnevulator/jpnevulator_git.bb +1 -1
index d00327996..39d645922 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
 
 PV = "2.3.6+git${SRCPV}"
 
-SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=http;branch=master;protocol=https"
+SRC_URI = "git://github.com/snarlistic/jpnevulator.git;protocol=https;branch=master"
 SRCREV = "bc1d4f6587a4a4829b5d55e3ca7ad584da6de545"
 
 S = "${WORKDIR}/git"
meta-oe/recipes-extended/mraa/mraa_git.bb +1 -1
index 2a50550a0..f1cdf66fc 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=91e7de50a8d3cf01057f318d72460acd"
 SRCREV = "7786c7ded5c9ce7773890d0e3dc27632898fc6b1"
 PV = "2.2.0+git${SRCPV}"
 
-SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \
+SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \
            file://0001-cmake-Use-a-regular-expression-to-match-x86-architec.patch \
            file://0001-include-Declare-gVERSION-global-as-extern.patch \
            "
meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb +1 -1
index 961fe7cef..f0c083c6d 100644
@@ -10,7 +10,7 @@ SRCREV = "3af04acd38bbc61bbdcdd931dcf234c971aa5336"
 PV = "1.8.0"
 
 SRC_URI = "\
-    git://github.com/oetiker/rrdtool-1.x.git;branch=master;protocol=http;;protocol=https \
+    git://github.com/oetiker/rrdtool-1.x.git;protocol=https;branch=master \
 "
 
 S = "${WORKDIR}/git"
meta-oe/recipes-extended/upm/upm_git.bb +1 -1
index 0ae7760bd..0695f9969 100644
@@ -10,7 +10,7 @@ DEPENDS = "libjpeg-turbo mraa"
 SRCREV = "5cf20df96c6b35c19d5b871ba4e319e96b4df72d"
 PV = "2.0.0+git${SRCPV}"
 
-SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=http;branch=master;protocol=https \
+SRC_URI = "git://github.com/eclipse/${BPN}.git;protocol=https;branch=master \
            file://0001-CMakeLists.txt-Use-SWIG_SUPPORT_FILES-to-find-the-li.patch \
            file://0001-Use-stdint-types.patch \
            file://0001-initialize-local-variables-before-use.patch \
meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb +1 -1
index 0bc03941f..ceff54f46 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e"
 
 SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd"
 SRC_URI = " \
-    git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x;protocol=https \
+    git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \
     file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \
 "
 S = "${WORKDIR}/git"
meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.1.bb +1 -1
index 2db16e114..53882b2f3 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/js-cookie/js-cookie"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e16cf0e247d84f8999bf55865a9c98cf"
 
-SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=http;branch=master;protocol=https"
+SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=https;branch=master"
 
 SRCREV = "0ba77141dd215782cc7770347a457906908c66ff"