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

support/download: convert localfiles to use the wrapper

Browse Source 
This drastically simplifies the localfiles helper, as it no longer has
to deal with atomically saving the downloaded archive.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
(Tested by setting BUSYBOX_SITE = file:///tmp and running 'make busybox-source')
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2014-08-03 19:53:36 +02:00 committed by Thomas Petazzoni
parent c48d45e342
commit 84469226c1
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/pkg-download.mk
View File

@ -209,8 +209,9 @@ endef
define DOWNLOAD_LOCALFILES
test -e $(DL_DIR)/$(2) || \
$(EXTRA_ENV) support/download/cp $(call stripurischeme,$(call qstrip,$(1))) \
$(DL_DIR)/$(2) && \
$(EXTRA_ENV) support/download/wrapper cp \
$(DL_DIR)/$(2) \
$(call stripurischeme,$(call qstrip,$(1))) && \
$(call VERIFY_HASH,$(PKGDIR)/$($(PKG)_NAME).hash,$(DL_DIR)/$(2))
endef

26
support/download/cp
View File

@ -1,26 +1,16 @@
#!/bin/bash
# We want to catch any command failure, and exit immediately
# We want to catch any unexpected failure, and exit immediately
set -e
# Download helper for cp
# Call it with:
# $1: source file
# $2: output file
# Download helper for cp, to be called from the download wrapper script
# Expected arguments:
# $1: output file
# $2: source file
# And this environment:
# LOCALFILES: the cp command to call
source="${1}"
output="${2}"
output="${1}"
source="${2}"
tmp_output="$( mktemp "${output}.XXXXXX" )"
ret=1
if ${LOCALFILES} "${source}" "${tmp_output}"; then
mv "${tmp_output}" "${output}"
ret=0
fi
# Cleanup
rm -f "${tmp_output}"
exit ${ret}
${LOCALFILES} "${source}" "${output}"