Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3/6] package/qt5: prepare for per-version hash files
Date: Fri, 12 Oct 2018 17:46:53 +0200	[thread overview]
Message-ID: <20181012154653.GB31509@scaer> (raw)
In-Reply-To: <12e99890-01c9-4a50-9276-b99815b90b71@lucaceresoli.net>

Lucal, All,

On 2018-10-12 09:12 +0200, Luca Ceresoli spake thusly:
> On 07/10/2018 13:57, Yann E. MORIN wrote:
> > The Qt5 packages may have different licensing terms between the two
> > versions we support, and in some cases, those different terms are
> > expressed in similarly named files, like files named plain 'LICENSE' for
> > example. This is problematic, because, in a .hash file, we can't store
> > two different hashes for the same file.
> > 
> > We've started to handle this case by moving the licenses hashes to the
> > per-version sub directories.
> > 
> > However, the hashes for the downloads are still stored inside the non-
> > versioned hash file of the package, which is not totally coherent: if we
> > have a per-version hash file, it should list all the hases for that
> > version, downloads included, and there should be no unversioned hash
> > file.
> > 
> > In preparation for this, we duplicate the downloads hashes from the main
> > hash files, and into the versioned ones. Once the download infra learns
> > to look for those hashes in these per-version subdirs, we'll remove the
> > unversioned hash files.
[--SNIP--]
> > diff --git a/package/qt5/qt5quickcontrols2/5.11.2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/5.11.2/qt5quickcontrols2.hash
> > new file mode 100644
> > index 0000000000..bdf844eb91
> > --- /dev/null
> > +++ b/package/qt5/qt5quickcontrols2/5.11.2/qt5quickcontrols2.hash
> > @@ -0,0 +1,7 @@
> > +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtquickcontrols2-everywhere-src-5.11.2.tar.xz.mirrorlist
> > +sha256 aa0549f9a4135f9d600b57f53347ebf344e60d21f90c6d844109755da12dcb84 qtquickcontrols2-everywhere-src-5.11.2.tar.xz
> > +
> > +# Hashes for license files:
> > +sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
> > +sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3
> > +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
[--SNIP--]
> > diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
> > index 1ebed34166..eb97371337 100644
> > --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
> > +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
> > @@ -3,8 +3,3 @@ sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickc
> >  
> >  # Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtquickcontrols2-everywhere-src-5.11.2.tar.xz.mirrorlist
> >  sha256 aa0549f9a4135f9d600b57f53347ebf344e60d21f90c6d844109755da12dcb84 qtquickcontrols2-everywhere-src-5.11.2.tar.xz
> > -
> > -# Hashes for license files:
> > -sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
> > -sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3
> > -sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
> 
> Shouldn't this removal happen in patch 5?

Notice how we create the .hash file for the 5.11.2 version? This means
that the hash-check for license files will be using it rather than the
main hash file.

So, the hashes for the license of the 5.11.2 version are no longer
usefull in the main hash file, ergo they get removed.

Thanks for the review of the series! :-)

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

  reply	other threads:[~2018-10-12 15:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-07 11:57 [Buildroot] [PATCH 0/6] core: look for package's hashes in versioned sub-directory Yann E. MORIN
2018-10-07 11:57 ` [Buildroot] [PATCH 1/6] core: add a variable that points to the package's hash file Yann E. MORIN
2018-10-12  7:43   ` Luca Ceresoli
2018-10-07 11:57 ` [Buildroot] [PATCH 2/6] legal-info: use the per-package variable to get the " Yann E. MORIN
2018-10-12  7:43   ` Luca Ceresoli
2018-10-07 11:57 ` [Buildroot] [PATCH 3/6] package/qt5: prepare for per-version hash files Yann E. MORIN
2018-10-12  7:12   ` Luca Ceresoli
2018-10-12 15:46     ` Yann E. MORIN [this message]
2018-10-12 22:07       ` Luca Ceresoli
2018-10-13  7:07         ` Yann E. MORIN
2018-10-07 11:57 ` [Buildroot] [PATCH 4/6] core/download: do not hard-code the path to hte package hash file Yann E. MORIN
2018-10-12  7:45   ` Luca Ceresoli
2018-10-07 11:57 ` [Buildroot] [PATCH 5/6] package/qt5: drop unversioned hash files Yann E. MORIN
2018-10-07 11:57 ` [Buildroot] [PATCH 6/6] docs/manual: document location of hash files for multi-versions packages Yann E. MORIN
2018-10-12  7:45   ` Luca Ceresoli
2018-10-11  8:19 ` [Buildroot] [PATCH 0/6] core: look for package's hashes in versioned sub-directory Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181012154653.GB31509@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox