Selaa lähdekoodia

package/qt5base: fix download

Since qt5base was last bumped in 8ab4a0a348b2 (package/qt5: bump packages
to latest kde submodule versions), the hash for the downloaded tarball
has changed:

    $ make qt5base-source
    [...]
    ERROR: expected: 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d
    ERROR: got     : 3067c4d84ba9927bfe65bf606c17af082199e0a3b22781fbf9bc6c6bc3de26dd

We know the hash was good back when 8ab4a0a348b2 was applied, because
the tarball has been cached on sources.buildroot.org with the expected
hash:

    $ curl 'https://sources.buildroot.net/qt5base/qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2' 2>/dev/null |sha256sum -
    935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d  -

But now, the archive generated by the KDE gorge (Gitlab underneath) has
another hash (as seen above). This means that the KDE forge (Gitlab) has
changed the way it generates archives. So, what's the delta? It turns
out that the only changes are about CRLF that were present in the
original archive, and are no longer in the new one. It is to be noted
that the affected files do not have CRLFS in the repository. It further
turns out that the archive was previously generated with .gitattibutes
of the main branch ('dev' in Qt repositories), while now they are
generated with the .gitattibutes of the commit for which they are
generated.

Switch to using the git download method for really reproducible
archives...

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Sebastian Weyer <sebastian.weyer@smile.fr>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Yann E. MORIN 1 vuosi sitten
vanhempi
commit
75da04c817
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 1 1
      package/qt5/qt5base/qt5base.hash
  2. 2 2
      package/qt5/qt5base/qt5base.mk

+ 1 - 1
package/qt5/qt5base/qt5base.hash

@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d  qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2
+sha256  9219c8e5d82b32b351743fb548f248400f3b3eca9db37a43b2b8c929d2625c01  qt5base-da6e958319e95fe564d3b30c931492dd666bfaff-git4.tar.gz
 
 # Hashes for license files:
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSE.GPL2

+ 2 - 2
package/qt5/qt5base/qt5base.mk

@@ -5,8 +5,8 @@
 ################################################################################
 
 QT5BASE_VERSION = da6e958319e95fe564d3b30c931492dd666bfaff
-QT5BASE_SITE = $(QT5_SITE)/qtbase/-/archive/$(QT5BASE_VERSION)
-QT5BASE_SOURCE = qtbase-$(QT5BASE_VERSION).tar.bz2
+QT5BASE_SITE = $(QT5_SITE)/qtbase
+QT5BASE_SITE_METHOD = git
 QT5BASE_CPE_ID_VENDOR = qt
 QT5BASE_CPE_ID_PRODUCT = qt