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))' \