From patchwork Sun Oct 7 11:57:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 980146 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rTEu4tYI"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ShpL24trzB2xn for ; Sun, 7 Oct 2018 22:58:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D0CFE21578; Sun, 7 Oct 2018 11:58:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id J8175jdVHxxc; Sun, 7 Oct 2018 11:58:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 070D4226C3; Sun, 7 Oct 2018 11:58:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0B7CD1BF429 for ; Sun, 7 Oct 2018 11:58:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 080C0868C4 for ; Sun, 7 Oct 2018 11:58:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FzrGzdEEC8ug for ; Sun, 7 Oct 2018 11:58:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id B3F13868A5 for ; Sun, 7 Oct 2018 11:58:09 +0000 (UTC) Received: by mail-wr1-f41.google.com with SMTP id x12-v6so17800033wru.8 for ; Sun, 07 Oct 2018 04:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NkMgTwnCC8VJrWpC6Nvo92+JFwNunnFxr88ketiEGXY=; b=rTEu4tYI6lYt40OvsdNiuV8LTs5SszMQTqcu3x5kOxlYOJbJcHCTcEf4tbGchMFbmW ULMZ+iu8Mb+XjcjKFBHaVkt7/jr8TktHTFBy0u7RLOqxrK2XKtTs8NkLrC5kyXeI+6jK Fj7RHW7oF8sDb9ugn8WnvaRlwzVkjB/FgIOGdrF3c0RGQVqDwT/vpxmgzJ5LhSVdwLhj HRLBZLN+Bd4q/ohq7BLO0XL+ZgfQGnRxH1jrXMGDU864N6Rip4Az55kOZ/PyelEcMmA5 01JCEq1poXIsMvCaACB5QgwcG1+21RLEPYxXgijkZFPvZi7MMzlu9AVNK4OEHvovSer0 5S9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NkMgTwnCC8VJrWpC6Nvo92+JFwNunnFxr88ketiEGXY=; b=BekAGwAsCRrLVFRslBtgMaFNh2MN0zs3DfqqqIcOliBaSoFVZSlVB5rK/pK6IC/zk4 62sfM3be1LNYo0eWRcxI+yOTmVFPGSPYO2hYJZb5WFhknlU9kBLgjq8XmcY7ZCRstyfl knavyjGe4dz1szrZOhi3jvGR0slM1xXz/JPodycruCuJOQytqXTZAlJltuVUfKwApz0g Ib37WMEr25VT9r6gdcvXGArlHYP6hY5hYAM/aZPN4zDR6i8to+1iJLbsWAgiOLDHBFX0 DhWQNZt5g/r2rbtR+2enl43JIM4nqU+oJwZiOcWkxtXkb71yI+NSAmidFQdp26PFE5cK rMuA== X-Gm-Message-State: ABuFfogYxxUMNFpss6sAL6fzEYwBSUOOXarkPsZ8jNyMra3E0U0eRQEQ N1ZPcf3eRbq6vFFpVdsveRDlrR7J X-Google-Smtp-Source: ACcGV61FbDdZdumPv/MKByDa8bJZUNKPKmV3Ucv8Rk6J8JteATIjJHmif2TS3ISL3gFa2GlDhBkhHg== X-Received: by 2002:adf:8425:: with SMTP id 34-v6mr12347553wrf.153.1538913487762; Sun, 07 Oct 2018 04:58:07 -0700 (PDT) Received: from localhost.localdomain ([2a01:cb19:829a:2800:68e8:7a61:9bb9:12a]) by smtp.gmail.com with ESMTPSA id v1-v6sm11373138wrd.24.2018.10.07.04.58.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 04:58:07 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 7 Oct 2018 13:57:40 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/6] package/qt5: prepare for per-version hash files X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Ga=C3=ABl_Portay?= , Peter Seiderer , Thomas Petazzoni , Luca Ceresoli , "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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. Note that there are a few other packages for which we support differents versions (uboot, binutils, gcc, gdb, lua, xserver_xorg-server), but none of those have different licensing terms due to the version. Qt5 is alone is this case. Signed-off-by: "Yann E. MORIN" Cc: Gaël Portay Cc: Peter Seiderer Cc: Julien Corjon Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Luca Ceresoli Cc: Baruch Siach --- package/qt5/qt5base/5.11.2/qt5base.hash | 11 +++++++++++ package/qt5/qt5base/5.6.3/qt5base.hash | 3 +++ package/qt5/qt5quickcontrols2/5.11.2/qt5quickcontrols2.hash | 7 +++++++ package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash | 3 +++ package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 5 ----- package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash | 3 +++ package/qt5/qt5virtualkeyboard/5.11.2/qt5virtualkeyboard.hash | 9 +++++++++ 7 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 package/qt5/qt5base/5.11.2/qt5base.hash create mode 100644 package/qt5/qt5quickcontrols2/5.11.2/qt5quickcontrols2.hash create mode 100644 package/qt5/qt5virtualkeyboard/5.11.2/qt5virtualkeyboard.hash diff --git a/package/qt5/qt5base/5.11.2/qt5base.hash b/package/qt5/qt5base/5.11.2/qt5base.hash new file mode 100644 index 0000000000..1c11adba2d --- /dev/null +++ b/package/qt5/qt5base/5.11.2/qt5base.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz.mirrorlist +sha256 6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107 qtbase-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 88ec689407cf2df9b2eb5c45952564d51ce73c129a3bdffb15c0d2d161ad7558 LICENSE.LGPLv3 +sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL +sha256 1f4fa3d202198f5d836993748eac9d91157e2cec7fb8426f56000a02a677cdc5 header.BSD +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING diff --git a/package/qt5/qt5base/5.6.3/qt5base.hash b/package/qt5/qt5base/5.6.3/qt5base.hash index f113f82c73..2dae2e8bf0 100644 --- a/package/qt5/qt5base/5.6.3/qt5base.hash +++ b/package/qt5/qt5base/5.6.3/qt5base.hash @@ -1,3 +1,6 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist +sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz + # Hashes for license files: sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 sha256 66f6bb53f6d985a4d651bf1ecfe8bbcbe32b0f744708d588f047580ee85d8ec8 LICENSE.LGPLv21 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 diff --git a/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash index 6f5bf29400..01fe5dcd61 100644 --- a/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash @@ -1,3 +1,6 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist +sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz + # Hashes for license files: sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 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 diff --git a/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash index 266fc3b695..0cc4f9c82e 100644 --- a/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/2.0/qt5virtualkeyboard.hash @@ -1,3 +1,6 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtvirtualkeyboard-opensource-src-2.0.tar.xz.mirrorlist +sha256 1d543a851e83fc3de40f48c2935f70278e842589b9a235c2b22f41733e561aec qtvirtualkeyboard-opensource-src-2.0.tar.xz + # Hashes for license files: sha256 6148d2793ca4e62ba3935a27bd3e46971a5d7c871dbe8f2687a867bd2c2589fb src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/virtualkeyboard/3rdparty/openwnn/NOTICE diff --git a/package/qt5/qt5virtualkeyboard/5.11.2/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/5.11.2/qt5virtualkeyboard.hash new file mode 100644 index 0000000000..c065a9e807 --- /dev/null +++ b/package/qt5/qt5virtualkeyboard/5.11.2/qt5virtualkeyboard.hash @@ -0,0 +1,9 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtvirtualkeyboard-everywhere-src-5.11.2.tar.xz.mirrorlist +sha256 2709500071e7e98ca6f6eecef0f5c80d19ae22aba562293352debd516633b197 qtvirtualkeyboard-everywhere-src-5.11.2.tar.xz + +# 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