NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg-infra: move the cp (aka localfiles) download helper to a script

Browse Source 
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" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2014-07-02 23:11:26 +02:00 committed by Peter Korsgaard
parent 54adff55d5
commit 283b8b7fea
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/pkg-download.mk
View File

@ -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

16
support/download/cp Executable file
View File

@ -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}"