From 060312567323024ec6fd90e4cec1485816cec811 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Fri, 22 Jun 2012 07:42:34 +0200 Subject: [PATCH] pkg-download.mk: allow using localfiles outside of package infrastructure 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 Signed-off-by: Thomas Petazzoni --- package/pkg-download.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 79837060b3..fb51540765 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -177,16 +177,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 ################################################################################ -- 2.30.2