From patchwork Fri Jun 22 05:42:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 166504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 809DFB6F62 for ; Fri, 22 Jun 2012 15:44:10 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2B7DD8C9EF; Fri, 22 Jun 2012 05:43:49 +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 ZlT1Sm4osGjC; Fri, 22 Jun 2012 05:43:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 183938C9BA; Fri, 22 Jun 2012 05:43:44 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7BA398F753 for ; Fri, 22 Jun 2012 05:43:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6592C8CA6E for ; Fri, 22 Jun 2012 05:43:28 +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 Cuu3OsNfa9oU for ; Fri, 22 Jun 2012 05:43:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id B68EC8C9BA for ; Fri, 22 Jun 2012 05:43:21 +0000 (UTC) Received: by eeke50 with SMTP id e50so809805eek.16 for ; Thu, 21 Jun 2012 22:43:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:content-type:mime-version:content-transfer-encoding:subject :x-mercurial-node:message-id:in-reply-to:references:user-agent:date :from:to:cc; bh=tsbSLIK5LYuyydltb56RixHFvWxw9C0hIMyCB7M37hE=; b=d7oMFSu4v4IitdYIJ7gMV56DJ+vDnVat6dZQ47lT6Y38hxlts/75bAvopTORmRquNw da/paijsXUM9/STaW5vzD/AY5mKzc2CgZQBFKL4tXTPEGhzZ1LGaDKYfRRdsBzqipvw2 Df/FsPYHBaJAH2QnyDgpSloFZVSGA/IN95G2uIcLgTEZYkU6VcPm1NcOyRb8GPDGE2vf SIOYTdxuih9PDhJhtFRo4ViADbfBnq8COV6aXpoR/RIlxZWNl1tu10X7Sdhzxx8Bxphy S5pbrEEnhw8IJ1kBXKn2WR2kNC/a/3zmI+hib38wJ0L2D9WjsUMogIhya6qh0OcICu9n llxg== Received: by 10.14.28.130 with SMTP id g2mr178009eea.29.1340343799714; Thu, 21 Jun 2012 22:43:19 -0700 (PDT) Received: from [127.0.1.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPS id c51sm109212458eei.12.2012.06.21.22.43.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 21 Jun 2012 22:43:18 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: 1dcdff3e9437fc63cd4b178a6739c13f8a483faf Message-Id: <1dcdff3e9437fc63cd4b.1340343754@beantl019720> In-Reply-To: References: User-Agent: Mercurial-patchbomb/2.0.2 Date: Fri, 22 Jun 2012 07:42:34 +0200 From: Thomas De Schampheleire To: buildroot@busybox.net Subject: [Buildroot] [PATCH 1 of 6 resend] pkg-download.mk: allow using localfiles outside of package infrastructure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net The localfiles download method uses $($(PKG)_SITE))) and $($(PKG)_SOURCE) instead of $(1) and $(2). This means that it can only be used for package downloads (through gentargets, autotargets, ...) and not for other downloads like external toolchains. This patch changes localfiles to allow this, just as the wget and scp download methods already did. For the version control download methods, nothing changes. Signed-off-by: Thomas De Schampheleire Acked-by: Arnout Vandecappelle (Essensium/Mind) --- package/pkg-download.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -174,16 +174,16 @@ define SHOW_EXTERNAL_DEPS_WGET endef define DOWNLOAD_LOCALFILES - test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ - $(LOCALFILES) $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE) $(DL_DIR) + test -e $(DL_DIR)/$(2) || \ + $(LOCALFILES) $(call qstrip,$(subst file://,,$(1))) $(DL_DIR) endef define SOURCE_CHECK_LOCALFILES - test -e $(call qstrip,$(subst file://,,$($(PKG)_SITE)))/$($(PKG)_SOURCE) + test -e $(call qstrip,$(subst file://,,$(1))) endef define SHOW_EXTERNAL_DEPS_LOCALFILES - echo $($(PKG)_SITE)/$($(PKG)_SOURCE) + echo $(2) endef ################################################################################