Commit 283b8b7f authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

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: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 54adff55

package/pkg-download.mk

+3 −2
Original line number Diff line number Diff line
@@ -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

support/download/cp

0 → 100755
+16 −0
Original line number Diff line number Diff line 
#!/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}"