diff mbox series

[v1,4/4] qt5virtualkeyboard: add hashes of 3rd-party licenses

Message ID 20180903123747.5234-5-gael.portay@savoirfairelinux.com
State Accepted
Headers show
Series qt5virtualkeyboard: fix build issues with 5.6 | expand

Commit Message

Gaël PORTAY Sept. 3, 2018, 12:37 p.m. UTC
Add missing license hashes for those three third-parties:

	- src/virtualkeyboard/3rdparty/openwnn/NOTICE
	- src/virtualkeyboard/3rdparty/pinyin/NOTICE
	- src/virtualkeyboard/3rdparty/tcime/COPYING

Fixes:

	>>> qt5virtualkeyboard 5.11.1 Collecting legal info
	LICENSE.GPL3: OK (sha256: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903)
	ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE
	ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE
	ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING
	src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: OK (sha256: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10)

Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
---
 package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash | 5 +++++
 package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash     | 3 +++
 2 files changed, 8 insertions(+)
 create mode 100644 package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash

Comments

Thomas Petazzoni Sept. 5, 2018, 9:34 p.m. UTC | #1
Hello,

+Yann in Cc.

On Mon,  3 Sep 2018 08:37:47 -0400, Gaël PORTAY wrote:
> Add missing license hashes for those three third-parties:
> 
> 	- src/virtualkeyboard/3rdparty/openwnn/NOTICE
> 	- src/virtualkeyboard/3rdparty/pinyin/NOTICE
> 	- src/virtualkeyboard/3rdparty/tcime/COPYING
> 
> Fixes:
> 
> 	>>> qt5virtualkeyboard 5.11.1 Collecting legal info  
> 	LICENSE.GPL3: OK (sha256: 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903)
> 	ERROR: No hash found for src/virtualkeyboard/3rdparty/openwnn/NOTICE
> 	ERROR: No hash found for src/virtualkeyboard/3rdparty/pinyin/NOTICE
> 	ERROR: No hash found for src/virtualkeyboard/3rdparty/tcime/COPYING
> 	src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt: OK (sha256: 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10)
> 
> Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>

So, I've applied, but...

> ---
>  package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash | 5 +++++
>  package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash     | 3 +++

I'm not happy with how we handle per-version hash files. What you did
is identical to what we do in qt5base, and you don't have much choice
right now, but it's not great.

The download infrastructure only checks the main hash file, i.e
package/<pkg>/<pkg>.hash, so we have to list in this file the hashes
for all files that are downloaded, regardless of their version.

However, the legal-info stuff looks first in
package/<pkg>/<version>/<pkg>.hash, and only if it doesn't exist, it
looks in package/<pkg>/<pkg>.hash. This means that we can store
per-version hashes for license files in
package/<pkg>/<version>/<pkg>.hash. This is needed because a file named
COPYING may exist in two different versions of a given package, but
with different contents, and therefore different hashes.

I think this is not very consistent today. I see two possible options:

 (1) Make the download stuff consistent with the legal-info stuff so
     that we can move the hashes for the downloaded stuff to the
     per-version folders.

 (2) Keep things as they are today in terms of infra, but move the
     hashes for license files in qt5base and qt5virtualkeyboard to
     per-version directories.

I am fine with (2), but I find the current situation where hashes for
some license files are in the main folder, and some hashes are in a
per-version folder is very confusing.

Yann ?

Best regards,

Thomas
Yann E. MORIN Sept. 9, 2018, 10:42 a.m. UTC | #2
Thomas, Gaël, All,

On 2018-09-05 23:34 +0200, Thomas Petazzoni spake thusly:
> On Mon,  3 Sep 2018 08:37:47 -0400, Gaël PORTAY wrote:
> > Add missing license hashes for those three third-parties:
[--SNIP--]
> >  package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash | 5 +++++
> >  package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash     | 3 +++
> I'm not happy with how we handle per-version hash files. What you did
> is identical to what we do in qt5base, and you don't have much choice
> right now, but it's not great.
> 
> The download infrastructure only checks the main hash file, i.e
> package/<pkg>/<pkg>.hash, so we have to list in this file the hashes
> for all files that are downloaded, regardless of their version.
> 
> However, the legal-info stuff looks first in
> package/<pkg>/<version>/<pkg>.hash, and only if it doesn't exist, it
> looks in package/<pkg>/<pkg>.hash. This means that we can store
> per-version hashes for license files in
> package/<pkg>/<version>/<pkg>.hash. This is needed because a file named
> COPYING may exist in two different versions of a given package, but
> with different contents, and therefore different hashes.
> 
> I think this is not very consistent today. I see two possible options:
> 
>  (1) Make the download stuff consistent with the legal-info stuff so
>      that we can move the hashes for the downloaded stuff to the
>      per-version folders.
> 
>  (2) Keep things as they are today in terms of infra, but move the
>      hashes for license files in qt5base and qt5virtualkeyboard to
>      per-version directories.
> 
> I am fine with (2), but I find the current situation where hashes for
> some license files are in the main folder, and some hashes are in a
> per-version folder is very confusing.
> 
> Yann ?

I think we should do (1). However, it might not be so trivial... :-/

Then, (1) implies we have to do (2) as well.

Furthermore, we should also check that, if there is a versioned
sub-directory, then there is no un-versioned .hash file, because it is
not going to be used.

Regards,
Yann E. MORIN.

> Best regards,
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
diff mbox series

Patch

diff --git a/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
new file mode 100644
index 0000000000..266fc3b695
--- /dev/null
+++ b/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash
@@ -0,0 +1,5 @@ 
+# Hashes for license files:
+sha256 6148d2793ca4e62ba3935a27bd3e46971a5d7c871dbe8f2687a867bd2c2589fb src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE
+sha256 ca3dd653e13c4a935622cfce00dc4e2d7a8295b64da99bd1d4f2a8ddb6b0956e src/virtualkeyboard/3rdparty/tcime/COPYING
diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
index bb916c06d3..9270366b93 100644
--- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
+++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
@@ -7,3 +7,6 @@  sha256 5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b  qtvirtu
 # Hashes for license files:
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
 sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt
+sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE
+sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/virtualkeyboard/3rdparty/pinyin/NOTICE
+sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/virtualkeyboard/3rdparty/tcime/COPYING