From patchwork Sun Oct 7 11:57:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 980144 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.137; helo=fraxinus.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="U9fJ90xb"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ShpG3pCSzB2xn for ; Sun, 7 Oct 2018 22:58:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 12B87858F7; Sun, 7 Oct 2018 11:58:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q75tXwB3FANV; Sun, 7 Oct 2018 11:58:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4AC0D8592A; Sun, 7 Oct 2018 11:58:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 900FE1BF429 for ; Sun, 7 Oct 2018 11:58:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8D34B220C2 for ; Sun, 7 Oct 2018 11:58:09 +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 7FjDoDdNRvch for ; Sun, 7 Oct 2018 11:58:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by silver.osuosl.org (Postfix) with ESMTPS id 2F63021578 for ; Sun, 7 Oct 2018 11:58:08 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id z204-v6so5697423wmc.5 for ; Sun, 07 Oct 2018 04:58:08 -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; bh=gJJbdaBZ6U5Mgmwx2GHw1Rgqz6qoouwO+1Bn0gjYopQ=; b=U9fJ90xbNY5uM9vpu/T9QSzstZUk/YWNTkYJhmZDeV66B3gIj/upF5zsdn/YOF3r6o Ap/EFExfQixacPrNon6+fI6KjdlkGZuXo/V0ZObz66CxnSR06dM1yx8XWPqjel0wTSSJ sTkHpLFO8TrOQabBpkBipzdf/3cn83ErqgdnmiyP46zKH0O8PYxoZb2UeBFVLVyv4XC3 ymHkQkkqifWZXBdkVFlI7oizPkgxWdU/SXdhzR5jDtw21utHkgn4c6eiRacQgzNhgQIy ceBvfueTSoOZIsfrlUhtxjE2tvEAgZfvTSOS3LdPls2pGxv3wuYK9/kGGKojme763jZJ aROA== 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; bh=gJJbdaBZ6U5Mgmwx2GHw1Rgqz6qoouwO+1Bn0gjYopQ=; b=AcPB5h0KYzBb4UGDhFwEUkETsABqMMrd8R7IWW+OQYUAlWlEO1lMpVRa07zvoblL7j dKKTab8xD0ceWRfjPbMIS7tg7wjywY+ag/HaFEiuMJocwr2knP0QfDAolOttLjASokxv ANZjJD0wJbUtzhRcaJbrQxwScD0KT02b4aIczP2ZXSzXVqphU6RkoF+u12U40IaCLIWY /E+ocIUSuxamzbCL+6I23yysJylWefps51q99yhIGznZet9WMW2+dk/138V7bIEEmcbP 4ezy4K6NJ8R/KvoDtp9yzBJulrp9ljVai/1B//MGyavv5vR2hsIq2NnJrGeeVeZL3/e+ mp6Q== X-Gm-Message-State: ABuFfohOYMRln7G7HnCKn2wOYo8ruSNdbfcDd8D2MZzLM9OfsQXY/Dcs I2qdmZ1OQ+w//wQ97lCocy+MUtmV X-Google-Smtp-Source: ACcGV61np4AXsPpVRKHazXoskIfWBJbzlIc9q40303/UPQXmG7vIKliJdrlp3xaS/feaMq6xW8MH9w== X-Received: by 2002:a1c:2d4:: with SMTP id 203-v6mr11875810wmc.148.1538913486358; Sun, 07 Oct 2018 04:58:06 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 04:58:05 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 7 Oct 2018 13:57:39 +0200 Message-Id: <7861534001e4844e3737d2fb88ff42a19d4ab68e.1538913431.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 2/6] legal-info: use the per-package variable to get the hash file 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: Luca Ceresoli , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Luca Ceresoli Cc: Baruch Siach Reviewed-by: Luca Ceresoli --- Makefile | 2 +- package/pkg-generic.mk | 2 +- package/pkg-utils.mk | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 82dd76ea76..4948b7f5b1 100644 --- a/Makefile +++ b/Makefile @@ -792,7 +792,7 @@ legal-info-clean: .PHONY: legal-info-prepare legal-info-prepare: $(LEGAL_INFO_DIR) @$(call MESSAGE,"Buildroot $(BR2_VERSION_FULL) Collecting legal info") - @$(call legal-license-file,buildroot,buildroot,support/legal-info,COPYING,COPYING,HOST) + @$(call legal-license-file,buildroot,buildroot,support/legal-info/buildroot.hash,COPYING,COPYING,HOST) @$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,TARGET) @$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,HOST) @$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved,HOST) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index b3d9ffe932..5bd131481f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -912,7 +912,7 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),) ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) $(Q)$$(call legal-warning-pkg,$$($(2)_BASENAME_RAW),cannot save license ($(2)_LICENSE_FILES not defined)) else - $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) + $(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_HASH_FILE),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) endif # license files ifeq ($$($(2)_SITE_METHOD),local) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index c3acc22b17..be287dc817 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -83,14 +83,10 @@ define legal-manifest # pkg, version, license, license-files, source, url, {HOST echo '"$(1)","$(2)","$(3)","$(4)","$(5)","$(6)"' >>$(LEGAL_MANIFEST_CSV_$(7)) endef -define legal-license-file # pkgname, pkgname-pkgver, pkgdir, filename, file-fullpath, {HOST|TARGET} +define legal-license-file # pkgname, pkgname-pkgver, pkg-hashfile, filename, file-fullpath, {HOST|TARGET} mkdir -p $(LICENSE_FILES_DIR_$(6))/$(2)/$(dir $(4)) && \ { \ - if [ -f $(3)/$($(PKG)_VERSION)/$(1).hash ]; then \ - support/download/check-hash $(3)/$($(PKG)_VERSION)/$(1).hash $(5) $(4); \ - else \ - support/download/check-hash $(3)/$(1).hash $(5) $(4); \ - fi; \ + support/download/check-hash $(3) $(5) $(4); \ case $${?} in (0|3) ;; (*) exit 1;; esac; \ } && \ cp $(5) $(LICENSE_FILES_DIR_$(6))/$(2)/$(4) 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 From patchwork Sun Oct 7 11:57:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 980149 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.133; helo=hemlock.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="sb7/9CZ/"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ShpP6b4yzB2xn for ; Sun, 7 Oct 2018 22:58:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9499A86C01; Sun, 7 Oct 2018 11:58:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ce9KTA9wt7Pn; Sun, 7 Oct 2018 11:58:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 21C5886BFB; Sun, 7 Oct 2018 11:58:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 08C281BF429 for ; Sun, 7 Oct 2018 11:58:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 063228593E for ; Sun, 7 Oct 2018 11:58:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7SsFTeyAlIKX for ; Sun, 7 Oct 2018 11:58:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 36C48858F7 for ; Sun, 7 Oct 2018 11:58:11 +0000 (UTC) Received: by mail-wm1-f44.google.com with SMTP id 206-v6so5543681wmb.5 for ; Sun, 07 Oct 2018 04:58:11 -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; bh=e1RKeRwTPrhpidWG5W5HilYkZFxRrE/90xQuwXMetms=; b=sb7/9CZ/fR5dwdjfXjcCYvB6b90cphbUQyew0iS9wJhA66hLVGEx7IMRTfoAMfGKU2 6PKB96w8utpkQUJrhQC17ltLGDT390j0VqmPVI4xQGYJOIMh5kRr2Tw2HeA3cmrrf3vu I2d8rNRQClyRA+aJhvIdN5xSnTFuEv8vjdNF505DIjOUxQHRICv4oBTtk6Ig1kdkVxC8 dlJiOHOKRr7rL5msHpB+B6nI16nqU39fWeah9LU7Km7gsHP0AeXsa7NBSA4T2ocQZZFX y5XNeD+PCUaWtG7+13CbpKTnrjAreD4XhdjRO1o+3BAuRD75h0R0v6bQ5BCa09tu57fZ HzVA== 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; bh=e1RKeRwTPrhpidWG5W5HilYkZFxRrE/90xQuwXMetms=; b=gyjJq+ZH3DLCA7kW46Dk6/3NBWG9ivH3J3GaiLgXAKVJpi7VuYfEKL7yOn3m5MSINe SihoeUHt3OcYCXOisvy/Ap5u1qPbRw34mtiRvVRdik3wOvCbBTv72tpIs52dZQLTE4NF bP9vU0IAPGKj2x9DN8MelpzfIAQo0MjlK47omk3yYUGe7NTEBFjDe3xQ+Jr0r94WakTe c10VtDI7euHkI6OBWe9Myx5bd3m+hJdYKf6xAQD7ONmlciHW7Eliawgurp4URAhO3mFI kBN/euOO2vuARN2kCx0R3s5eOc2W/ONku1QoVBLKn+ki05UJOm5ocJCPK0C7qPnfKLH2 iRoA== X-Gm-Message-State: ABuFfogF+Zg0et5x/Y8PZdehLbuVzecq3zW0B/nUEv0SZ1A6cL2lm/FQ mRAq2YysS40+LFYb0p7WreuW6gn5 X-Google-Smtp-Source: ACcGV63CmqQ5asdW/32tqE55D5Lw5CHk5gx6Ko0VwuSpI1c5AAEA6JCv1Ji0mv97lgKrbQwT5ITz6Q== X-Received: by 2002:a1c:a55:: with SMTP id 82-v6mr13061431wmk.54.1538913489302; Sun, 07 Oct 2018 04:58:09 -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.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 04:58:08 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 7 Oct 2018 13:57:41 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 4/6] core/download: do not hard-code the path to hte package hash file 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: Luca Ceresoli , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Now that packges may have hashes for their downloaded files in a versioned subdir or in the unversioned hash file, we can no longer hard-code the path to the package hash file anymore. Instead, we now make use of the per-package variable, that points to the package hash file. Note: of the packages for which we offer a version choice, almost none, but some of the qt5 ones, have a per-version hash file, so we still use the unversioned hash file for them. As for the few qt5 packages that do have a per-version hash file for their licensing terms, they've already been updated to duplicate their download hashes in both the unversioned and per-version hash files. So, one way or the other, no hash check would go missing with this change. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Luca Ceresoli Cc: Baruch Siach Reviewed-by: Luca Ceresoli --- package/pkg-download.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index bf93b9a08e..73ea2a69f8 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -97,7 +97,7 @@ define DOWNLOAD -d '$($(PKG)_DL_DIR)' \ -D '$(DL_DIR)' \ -f '$(notdir $(1))' \ - -H '$(PKGDIR)/$($(PKG)_RAWNAME).hash' \ + -H '$($(PKG)_HASH_FILE)' \ -n '$($(PKG)_BASENAME_RAW)' \ -N '$($(PKG)_RAWNAME)' \ -o '$($(PKG)_DL_DIR)/$(notdir $(1))' \ From patchwork Sun Oct 7 11:57:42 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: 980148 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.138; helo=whitealder.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="h0D+kNMu"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ShpN0jM7zB3sq for ; Sun, 7 Oct 2018 22:58:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2CDBD868A5; Sun, 7 Oct 2018 11:58:18 +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 JEZRDwsWd+xX; Sun, 7 Oct 2018 11:58:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id C6D0C868B9; Sun, 7 Oct 2018 11:58:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7F2221BF429 for ; Sun, 7 Oct 2018 11:58:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7861B21578 for ; Sun, 7 Oct 2018 11:58:13 +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 4DZ7QoKskHRv for ; Sun, 7 Oct 2018 11:58:12 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by silver.osuosl.org (Postfix) with ESMTPS id 513F822725 for ; Sun, 7 Oct 2018 11:58:12 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id q5-v6so17794919wrw.12 for ; Sun, 07 Oct 2018 04:58:12 -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=kNS1eqSALXAHop5c6m/xLkagLGjKvc2ugdHx1Ib7A6s=; b=h0D+kNMuOlox34SyY9yS3MeRL60DFsTZle2qIU8emgHL/xYe69CnedagQMqXnidncX fb2wKDeb3mKkixkut41SfgWyq1tjdxz+6kVVEEE3A96/PGGfsdIF7NmHsrdvcb9+Uamr LYm8LOCt1LC2tpDs8YvuNt247zPhIgXKMBsOT2GIoWx0Z+xzDbmPoGN0IcnIqVctXwa7 +dEF3+UDVD0TfocgAWZijhJQ093jCzVmon6pkPgzfLvn1kpu+iq+XSVNd0gsIRRmKRfj 1jwrIMDvjqAcsuxSmGxFr2Vbn90sj9hMpvl1a1xT1n3JPam5qxIPzZ8ler8W3+/3BxHm r3EQ== 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=kNS1eqSALXAHop5c6m/xLkagLGjKvc2ugdHx1Ib7A6s=; b=BprlI5iTp/TWyzu/O8kclIClM/qa+kuOIM8PQqUkEBVz17crJLifW4sDr6yU1qwVA4 2FJsJZhFgAmdrxMxblQ4btKj01NBVifuItRgmiv7TVWI/283v8DuhjkW3X2Py5QMuB/d EwP+2X1ZVclJZaBS88nVgeVJ/Xe/p4uMDjT91ygdsP0cft5taI6RlPyj/I8xlZ+/lPTb QzsqmKOo22+kJXaUbHnp7fzxwaCr5OFy37JM772Rs63J5KCGnVTnQ1ZnomHp2YXiNU8Q BDcAFM/waeikl/fn6UjO94fksON7WeJnz6amaklrxN4Y8xTUL9FoV3YCOt4WrziwUWTs NQnQ== X-Gm-Message-State: ABuFfoiSrfqi8EyrZ/BQBPwiKDi/8KEuqq+Fy8yq78L9rLZUJDzCgYkD dkuVfeBhvAPRyti4pGKc5qmkDj/M X-Google-Smtp-Source: ACcGV60QN+pbmRuBp5P1s4PL1Jc2UsaqKdERR5x/hm0kJxHGcR1he9ymaXNekDkfZpNDh64v5wAXfQ== X-Received: by 2002:adf:fa92:: with SMTP id h18-v6mr13383625wrr.74.1538913490431; Sun, 07 Oct 2018 04:58:10 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 04:58:09 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 7 Oct 2018 13:57:42 +0200 Message-Id: <36f31dd619e2ebef80334f935c9f2e9cc528de50.1538913431.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/6] package/qt5: drop unversioned 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 download infra now knows to look for per-version hash files, so we can now drop the unversioned hash files. Instead of removing them, add a comment that redirect the developper to update the per-version hash files instead (so they do not re-add a unversioned hash file in the future). 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/qt5base.hash | 16 ++-------------- package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash | 7 ++----- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash | 14 ++------------ 3 files changed, 6 insertions(+), 31 deletions(-) diff --git a/package/qt5/qt5base/qt5base.hash b/package/qt5/qt5base/qt5base.hash index daac4e06a3..5316f03b10 100644 --- a/package/qt5/qt5base/qt5base.hash +++ b/package/qt5/qt5base/qt5base.hash @@ -1,14 +1,2 @@ -# 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 - -# 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 +# This hash file is not used; instead, update the +# hash files in the per-version sub-directories. diff --git a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash index eb97371337..5316f03b10 100644 --- a/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash @@ -1,5 +1,2 @@ -# 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 - -# 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 +# This hash file is not used; instead, update the +# hash files in the per-version sub-directories. diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash index d4b7e58e38..5316f03b10 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash @@ -1,12 +1,2 @@ -# 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 - -# 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 +# This hash file is not used; instead, update the +# hash files in the per-version sub-directories. From patchwork Sun Oct 7 11:57:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 980147 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.137; helo=fraxinus.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="XJm53Nui"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ShpM5HchzB2xn for ; Sun, 7 Oct 2018 22:58:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2F45C8593C; Sun, 7 Oct 2018 11:58:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VVuJhDJelwET; Sun, 7 Oct 2018 11:58:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 883E18593E; Sun, 7 Oct 2018 11:58:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5EEC21BF429 for ; Sun, 7 Oct 2018 11:58:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5C88B86BFB for ; Sun, 7 Oct 2018 11:58:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5eP0N23dwsQk for ; Sun, 7 Oct 2018 11:58:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7BDDE86B25 for ; Sun, 7 Oct 2018 11:58:13 +0000 (UTC) Received: by mail-wm1-f49.google.com with SMTP id y140-v6so6792642wmd.0 for ; Sun, 07 Oct 2018 04:58:13 -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; bh=flo4bRw1Th5Am3CW61bu6q5lH8rf79fPrWtAuyOOPOk=; b=XJm53Nuigm6mMYCYiL+iSxkdcDQmGJ9FtGbsOTPsQQf44QGMiTGxuSIUWc1+EprakX N5uGEPLXfPJGGOEB2F4RdZ/EUnvUPvUgPYgv6aJKcLQSd/2bqZ68wmbJC5/yIlXLWWxZ Lkr4NBnoR8tgMiwIuG6oTo+UXmMsjkX+SjI3G6rltQO3Aq2Z95MdAbRpXMJrqKCTWN2n lS/2zh1Uk9cdIEAzWjrDpsKkMjKBQmxy6/aqwFJUWvtoUFoJi//dHQRjsy2++M2f49tn fu2bss+ODNJT2D0dRXBq+IjiOZk+0mbz95s+RktM3tYsCtt3IWlZ5dyTTL9oQiOQYMKA B3gg== 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; bh=flo4bRw1Th5Am3CW61bu6q5lH8rf79fPrWtAuyOOPOk=; b=IAWpkXWkOOmYwMjp7r4Jw1/3KY5PuOj8P8Q8YWlPzZOx08FaA36V4BQSAqj6fpWpXt 3FctfBmAgxw3clp9Y7XoaYeu5c4S/8jClN+HpsOrQHHJDdaXma87jSds7gA3MuQhXXKe EQhQwM56kkl8zmNt0ogq5Mb3W3+fA/FxhvMc9W7HsnqVtDSuGoVMnxcBw6MViE6q3Ezz ktlUDXfE7dsl2YHP8bkSVbshsG9WVlnFZ5zJ1LUh5YCHh1yye1ofUMjZqN3YSTIfnqu+ OuL1GWmeFwWAVuJmZ5hybfUkt5ER2zn9YSHfru9E2F1d6XCVfTgyHWvvoHHRicg1vWov 3JpQ== X-Gm-Message-State: ABuFfohhkfO2MERVaWBHHJ+HuxeZLudMCYAO6XfIdmjOG9cCkn9I+rzb C5vFwizpRdit33B6CgQRyYWRbL8x X-Google-Smtp-Source: ACcGV60fQEBg2wD4E9KnV0/f+yD7S3l1txzvqqXJYws8QOsX0bRHPHT7XaPdaaFUT9uAV58Iof6ZGQ== X-Received: by 2002:a1c:1183:: with SMTP id 125-v6mr12985808wmr.103.1538913491469; Sun, 07 Oct 2018 04:58:11 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Oct 2018 04:58:10 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 7 Oct 2018 13:57:43 +0200 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: Subject: [Buildroot] [PATCH 6/6] docs/manual: document location of hash files for multi-versions packages 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: Thomas Petazzoni , Luca Ceresoli , "Yann E. MORIN" , Thomas De Schampheleire MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: "Yann E. MORIN" Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Arnout Vandecappelle Cc: Luca Ceresoli Cc: Baruch Siach Reviewed-by: Luca Ceresoli --- docs/manual/adding-packages-directory.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index f5e1e313d5..761605eda9 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -444,6 +444,13 @@ contains the hashes of the downloaded files for the +libfoo+ package. The only reason for not adding a +.hash+ file is when hash checking is not possible due to how the package is downloaded. +When a package has a version selection choice, then the hash file may be +stored in a subdirectory named after the version, e.g. ++package/libfoo/1.2.3/libfoo.hash+. This is especially important if the +different versions have different licensing terms, but they are stored +in the same file. Otherwise, the hash file should stay in the package's +directory. + The hashes stored in that file are used to validate the integrity of the downloaded files and of the license files.