From patchwork Sun Dec 7 23:53:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 418538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 07CAC1400EA for ; Mon, 8 Dec 2014 10:53:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CE162A20FE; Sun, 7 Dec 2014 23:53:36 +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 NZmCnn591t7A; Sun, 7 Dec 2014 23:53:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4C3CFA2046; Sun, 7 Dec 2014 23:53:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 045221C167B for ; Sun, 7 Dec 2014 23:53:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EB88CA1F36 for ; Sun, 7 Dec 2014 23:53:26 +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 JxhZn3S_c_jQ for ; Sun, 7 Dec 2014 23:53:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 99605A1CDE for ; Sun, 7 Dec 2014 23:53:23 +0000 (UTC) Received: by mail-wg0-f53.google.com with SMTP id l18so4886146wgh.26 for ; Sun, 07 Dec 2014 15:53:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=0l/yPjizlJ0yk1aePY5R4ZAoCZoaJFOHsK0fwSp5nbU=; b=bUyXeObq8PPnSC3jhZO0XRLErCAfO93EvwY8sgn1UXspaHI7YBMBLKMTWa7orWYCkE xLk+QoQl+VzGpsJfozoti+HaivzEoJwPRFeH/7zeVGf6G5K6/R93JAexKzvbHIZQyIGv znZECivzOwCv0Z2pFlzd9tg2WM/QdwLu779KSq1x+xv6LUYYpQSuIUPFd7XHldU4KERB y9sbXsqAszyeqMTxxb6Xm9YgpL82BS2dWQKXWtBYR155u9OU3RCsYZZARVSCS++ZaXOg Gy34b+5+PS1+wvY4SnMekqxRRGEKme2VunmylPAhsLZWwAkP11CS3i9ZAp9r+4FgemGi Ag/Q== X-Received: by 10.194.85.137 with SMTP id h9mr6240728wjz.70.1417996402261; Sun, 07 Dec 2014 15:53:22 -0800 (PST) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id eu15sm7617984wid.18.2014.12.07.15.53.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Dec 2014 15:53:21 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 8 Dec 2014 00:53:14 +0100 Message-Id: <9841e53593037a2530080dfea00b426b7e95b8c7.1417996302.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" , Peter Korsgaard Subject: [Buildroot] [PATCH 4/5 v3] pkg-download: fix checking hash for host packages X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, we use $($(PKG)_NAME) to find the hash file. but for host package, $(PKG) is host-foo, which would have us look for host-foo.hash, while the hash file is really foo.hash. Fix that by using the raw name of the package, $($(PKG)_RAWNAME). Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Peter Korsgaard --- package/pkg-download.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 407e8c8..ba72fc1 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -87,7 +87,7 @@ github = https://github.com/$(1)/$(2)/archive/$(3) define DOWNLOAD_GIT $(EXTRA_ENV) $(DL_WRAPPER) -b git \ -o $(DL_DIR)/$($(PKG)_SOURCE) \ - -H $(PKGDIR)/$($(PKG)_NAME).hash \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ @@ -108,7 +108,7 @@ endef define DOWNLOAD_BZR $(EXTRA_ENV) $(DL_WRAPPER) -b bzr \ -o $(DL_DIR)/$($(PKG)_SOURCE) \ - -H $(PKGDIR)/$($(PKG)_NAME).hash \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ @@ -126,7 +126,7 @@ endef define DOWNLOAD_CVS $(EXTRA_ENV) $(DL_WRAPPER) -b cvs \ -o $(DL_DIR)/$($(PKG)_SOURCE) \ - -H $(PKGDIR)/$($(PKG)_NAME).hash \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -- \ $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ $($(PKG)_DL_VERSION) \ @@ -146,7 +146,7 @@ endef define DOWNLOAD_SVN $(EXTRA_ENV) $(DL_WRAPPER) -b svn \ -o $(DL_DIR)/$($(PKG)_SOURCE) \ - -H $(PKGDIR)/$($(PKG)_NAME).hash \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ @@ -167,7 +167,7 @@ endef define DOWNLOAD_SCP $(EXTRA_ENV) $(DL_WRAPPER) -b scp \ -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_NAME).hash \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -- \ '$(call stripurischeme,$(call qstrip,$(1)))' endef @@ -184,7 +184,7 @@ endef define DOWNLOAD_HG $(EXTRA_ENV) $(DL_WRAPPER) -b hg \ -o $(DL_DIR)/$($(PKG)_SOURCE) \ - -H $(PKGDIR)/$($(PKG)_NAME).hash \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -- \ $($(PKG)_SITE) \ $($(PKG)_DL_VERSION) \ @@ -205,7 +205,7 @@ endef define DOWNLOAD_WGET $(EXTRA_ENV) $(DL_WRAPPER) -b wget \ -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_NAME).hash \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -- \ '$(call qstrip,$(1))' endef @@ -221,7 +221,7 @@ endef define DOWNLOAD_LOCALFILES $(EXTRA_ENV) $(DL_WRAPPER) -b cp \ -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_NAME).hash \ + -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ -- \ $(call stripurischeme,$(call qstrip,$(1))) endef