From 283b8b7feaccbe23decc69c2b3300b2a2d74d02d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 2 Jul 2014 23:11:26 +0200 Subject: [PATCH] pkg-infra: move the cp (aka localfiles) download helper to a script Maintaining the download helpers in the Makefile has proved to be a bit complex, so move it to a shell script. Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/pkg-download.mk | 5 +++-- support/download/cp | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100755 support/download/cp diff --git a/package/pkg-download.mk b/package/pkg-download.mk index eec91b8665..d3cd0c144e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -16,7 +16,7 @@ export GIT := $(call qstrip,$(BR2_GIT)) export HG := $(call qstrip,$(BR2_HG)) $(QUIET) export SCP := $(call qstrip,$(BR2_SCP)) $(QUIET) SSH := $(call qstrip,$(BR2_SSH)) $(QUIET) -LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) +export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) # Default spider mode is 'DOWNLOAD'. Other possible values are 'SOURCE_CHECK' # used by the _source-check target and 'SHOW_EXTERNAL_DEPS', used by the @@ -192,7 +192,8 @@ endef define DOWNLOAD_LOCALFILES test -e $(DL_DIR)/$(2) || \ - $(LOCALFILES) $(call stripurischeme,$(call qstrip,$(1))) $(DL_DIR) + $(EXTRA_ENV) support/download/cp $(call stripurischeme,$(call qstrip,$(1))) \ + $(DL_DIR) endef define SOURCE_CHECK_LOCALFILES diff --git a/support/download/cp b/support/download/cp new file mode 100755 index 0000000000..3e9f54847f --- /dev/null +++ b/support/download/cp @@ -0,0 +1,16 @@ +#!/bin/bash + +# We want to catch any command failure, and exit immediately +set -e + +# Download helper for cp +# Call it with: +# $1: source file +# $2: output file +# And this environment: +# LOCALFILES: the cp command to call + +source="${1}" +output="${2}" + +${LOCALFILES} "${source}" "${output}" -- 2.30.2