Skip to contentSkip to conversation

qt5connectivity: add license files hashes

PATCH New Peter Seiderer 4 participants 9 messages Oct 2, 2018 – Oct 9, 2018

lore
Share & tools
lore

Peter Seiderer

author
#0 lore raw

PATCH 1/3 qt5connectivity: add license files hashes

Signed-off-by Peter Seiderer <[email protected]>
---
 package/qt5/qt5connectivity/qt5connectivity.hash | 11 +++++++++++
 1 file changed, 11 insertions(+)
package/qt5/qt5connectivity/qt5connectivity.hash +11 -0
index 96f22db60a..e789ce0b4f 100644
@@ -3,3 +3,14 @@ sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnec
 
 # Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtconnectivity-everywhere-src-5.11.2.tar.xz.mirrorlist
 sha256 58901bbd14d3bc472f27fe305fd8dc33cffbd10da83616e9691c04c3290d42c5 qtconnectivity-everywhere-src-5.11.2.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
Signature · 1 line
2.19.0
author
#1 lore raw

PATCH 2/3 qt5serialbus: fix 5.6.3 license file hashes

Fixes [1]:

ERROR: LICENSE.FDL has wrong sha256 hash:
ERROR: expected: ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d
ERROR: got : f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d

[1] http://autobuild.buildroot.net/results/f8dba48bc1e71332f3983e78c40989e5f864abf3

Signed-off-by Peter Seiderer <[email protected]>
---
 package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash
package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash new file +5 -0
new file mode 100644
index 0000000000..574fcc5294
@@ -0,0 +1,5 @@
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL
Signature · 1 line
2.19.0
#2 lore raw

PATCH 2/3 qt5serialbus: fix 5.6.3 license file hashes

Hi Peter,

Quoted 20 lines · Peter Seiderer

Fixes [1]:

ERROR: LICENSE.FDL has wrong sha256 hash:
ERROR: expected: ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d
ERROR: got : f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d

[1] http://autobuild.buildroot.net/results/f8dba48bc1e71332f3983e78c40989e5f864abf3

Signed-off-by Peter Seiderer <[email protected]>
---
 package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash
package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash new file +0 -0
new file mode 100644
index 0000000000..574fcc5294

package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash line 5

Quoted 5 lines
package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash new file +5 -0
@@ -0,0 +1,5 @@
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL

Shouldn't the tarball hash move also here? Having the 5.6.x tarball hash in the default .hash file is confusing.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#3 lore raw

PATCH 2/3 qt5serialbus: fix 5.6.3 license file hashes

Hello,

Quoted 2 lines · Baruch Siach

Shouldn't the tarball hash move also here? Having the 5.6.x tarball hash in the default .hash file is confusing.

This doesn't work, because the download wrapper only uses the main hash file:

define DOWNLOAD

        $(Q)mkdir -p $($(PKG)_DL_DIR)
        $(Q)$(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \
                -c '$($(PKG)_DL_VERSION)' \
                -d '$($(PKG)_DL_DIR)' \
                -D '$(DL_DIR)' \
                -f '$(notdir $(1))' \
                -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \
                -n '$($(PKG)_BASENAME_RAW)' \
                -N '$($(PKG)_RAWNAME)' \
                -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \
                $(if $($(PKG)_GIT_SUBMODULES),-r) \
                $(DOWNLOAD_URIS) \
                $(QUIET) \
                -- \
                $($(PKG)_DL_OPTS)

endef

See the value passed to the -H option. It works for license files because:

define legal-license-file # pkgname, pkgname-pkgver, pkgdir, filename, file-fullpath, {HOST|TARGET}

	mkdir -p $(LICENSE_FILES_DIR_$(6))/$(2)/$(dir $(4)) && \
	{ \
		if [ -f $(3)/$($(PKG)_VERSION)/$(1).hash ]; then \
			support/download/check-hash $(3)/$($(PKG)_VERSION)/$(1).hash $(5) $(4); \
		else \
			support/download/check-hash $(3)/$(1).hash $(5) $(4); \
		fi; \
		case $${?} in (0|3) ;; (*) exit 1;; esac; \
	} && \
	cp $(5) $(LICENSE_FILES_DIR_$(6))/$(2)/$(4)

endef

I discussed this topic on the mailing list a few weeks ago with Yann. See
http://lists.busybox.net/pipermail/buildroot/2018-September/229892.html
and
http://lists.busybox.net/pipermail/buildroot/2018-September/230404.html.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 2/3 qt5serialbus: fix 5.6.3 license file hashes

Thomas, All,

On 2018-10-03 14:49 +0200, Thomas Petazzoni spake thusly:

Quoted 6 lines · Baruch Siach
Quoted 2 lines

Shouldn't the tarball hash move also here? Having the 5.6.x tarball hash in the default .hash file is confusing.

This doesn't work, because the download wrapper only uses the main hash file:

[--SNIP--]

Quoted 5 lines

I discussed this topic on the mailing list a few weeks ago with Yann. See
http://lists.busybox.net/pipermail/buildroot/2018-September/229892.html
and
http://lists.busybox.net/pipermail/buildroot/2018-September/230404.html.

I'm working on it. It is not straightforward.

I should have something clean enough to post later in the WE...

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#5 lore raw

PATCH 2/3 qt5serialbus: fix 5.6.3 license file hashes

In reply to Peter Seiderer

Hello,

Quoted 6 lines · Peter Seiderer

Fixes [1]:

ERROR: LICENSE.FDL has wrong sha256 hash:
ERROR: expected: ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d
ERROR: got : f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d

Quoted 7 lines

[1] http://autobuild.buildroot.net/results/f8dba48bc1e71332f3983e78c40989e5f864abf3

Signed-off-by Peter Seiderer <[email protected]>
---
 package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 package/qt5/qt5serialbus/5.6.3/qt5serialbus.hash

Applied to master, thanks. I did a follow-up commit to move the 5.11.2 hashes to a per version hash file. I think we should do this for all Qt5 modules.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
author
#6 lore raw

PATCH 3/3 qt5serialport: fix 5.6.3 license file hashes

In reply to Peter Seiderer

Fixes [1]:

ERROR: LICENSE.FDL has wrong sha256 hash:
ERROR: expected: ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d
ERROR: got : e1251235ce9853eecfecfa905da9ee29e9b76e4db2a1c9c4a20699f460419b08

[1] http://autobuild.buildroot.net/results/320db38e94d68b2ea4451c3cc0bd7742c125cedb

Signed-off-by Peter Seiderer <[email protected]>
---
 package/qt5/qt5serialport/5.6.3/qt5serialport.hash | 7 +++++++
 package/qt5/qt5serialport/qt5serialport.hash       | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 package/qt5/qt5serialport/5.6.3/qt5serialport.hash
package/qt5/qt5serialport/5.6.3/qt5serialport.hash new file +7 -0
new file mode 100644
index 0000000000..56f2f6e500
@@ -0,0 +1,7 @@
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 e1251235ce9853eecfecfa905da9ee29e9b76e4db2a1c9c4a20699f460419b08 LICENSE.FDL
package/qt5/qt5serialport/qt5serialport.hash +0 -5
index fd5c6642c2..ce0d139da1 100644
@@ -6,12 +6,7 @@ sha256 b01b69ce421d449402363c0cf617fcc8856e39d6d2c28aa3d06d1f5359dc6f6e qtserial
 
 # Hashes for license files:
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
-sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
-sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
 sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
 sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
-sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
 sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
-sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
-sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt
Signature · 1 line
2.19.0
Applied
#7 lore raw

PATCH 3/3 qt5serialport: fix 5.6.3 license file hashes

Hello,

Quoted 6 lines · Peter Seiderer

Fixes [1]:

ERROR: LICENSE.FDL has wrong sha256 hash:
ERROR: expected: ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d
ERROR: got : e1251235ce9853eecfecfa905da9ee29e9b76e4db2a1c9c4a20699f460419b08

Quoted 8 lines

[1] http://autobuild.buildroot.net/results/320db38e94d68b2ea4451c3cc0bd7742c125cedb

Signed-off-by Peter Seiderer <[email protected]>
---
 package/qt5/qt5serialport/5.6.3/qt5serialport.hash | 7 +++++++
 package/qt5/qt5serialport/qt5serialport.hash       | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 package/qt5/qt5serialport/5.6.3/qt5serialport.hash

Applied to master, I also split the hashes of the 5.11.2 license files in a separate hash file. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

PATCH 1/3 qt5connectivity: add license files hashes

In reply to Peter Seiderer

Hello,

Quoted 14 lines · Peter Seiderer
Signed-off-by Peter Seiderer <[email protected]>
---
 package/qt5/qt5connectivity/qt5connectivity.hash | 11 +++++++++++
 1 file changed, 11 insertions(+)
package/qt5/qt5connectivity/qt5connectivity.hash +1 -0
index 96f22db60a..e789ce0b4f 100644
@@ -3,3 +3,14 @@ sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnec
 
 # Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtconnectivity-everywhere-src-5.11.2.tar.xz.mirrorlist
 sha256 58901bbd14d3bc472f27fe305fd8dc33cffbd10da83616e9691c04c3290d42c5 qtconnectivity-everywhere-src-5.11.2.tar.xz
+

package/qt5/qt5connectivity/qt5connectivity.hash sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnec · line 16

Quoted 10 lines
package/qt5/qt5connectivity/qt5connectivity.hash +10 -0
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3

Actually, I think per-version hash files are better, and that's the direction we are taking, so I've split this into two hash files, one per version. Of course for the tarballs, I kept the common hash file for now, as this is the only thing we support.

Also, the hash for LGPL_EXCEPTION.txt was missing for the 5.6.3 version, so I've added that.

Applied with those changes. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com