From 90b9302e8357f9ef8266f9491b6c7a1f5bb32e01 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 2 Jun 2024 18:21:23 +0200 Subject: [PATCH] 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 Cc: Sebastian Weyer Cc: Peter Korsgaard Signed-off-by: Peter Korsgaard (cherry picked from commit 75da04c817b07a9c426cf2e438b0f8883096f4ef) [Peter: adjust for filename/hash used on 2024.02.x] Signed-off-by: Peter Korsgaard --- package/qt5/qt5base/qt5base.hash | 2 +- package/qt5/qt5base/qt5base.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index ffc474f49e..8f28cdb556 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 935d01f5c34903ad9e979431cec7a8a59332ed3fc539e639f5ba87e8d6989b9d qtbase-da6e958319e95fe564d3b30c931492dd666bfaff.tar.bz2 +sha256 7fdd81fc6c157c3e65e16b306e90c8dd4363d10b752d7379251dfb7214cb0574 qt5base-da6e958319e95fe564d3b30c931492dd666bfaff-br1.tar.gz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e173639cca..bbab9b3de1 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/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