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

pkg-infra: move the wget 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>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Yann E. MORIN 2014-07-02 23:11:23 +02:00 committed by Peter Korsgaard
parent 2fd4b959bd
commit 4bee7629ee
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/pkg-download.mk
View File

@ -8,7 +8,7 @@
################################################################################
# Download method commands
WGET := $(call qstrip,$(BR2_WGET)) $(QUIET)
export WGET := $(call qstrip,$(BR2_WGET)) $(QUIET)
export SVN := $(call qstrip,$(BR2_SVN))
export CVS := $(call qstrip,$(BR2_CVS))
BZR := $(call qstrip,$(BR2_BZR))
@ -175,17 +175,10 @@ define SHOW_EXTERNAL_DEPS_HG
echo $($(PKG)_SOURCE)
endef
# Download a file using wget. Only download the file if it doesn't
# already exist in the download directory. If the download fails,
# remove the file (because wget -O creates a 0-byte file even if the
# download fails). To handle an interrupted download as well, download
# to a temporary file first. The temporary file will be overwritten
# the next time the download is tried.
define DOWNLOAD_WGET
test -e $(DL_DIR)/$(2) || \
($(WGET) -O $(DL_DIR)/$(2).tmp '$(call qstrip,$(1))' && \
mv $(DL_DIR)/$(2).tmp $(DL_DIR)/$(2)) || \
(rm -f $(DL_DIR)/$(2).tmp ; exit 1)
$(EXTRA_ENV) support/download/wget '$(call qstrip,$(1))' $(DL_DIR)/$(2)
endef
define SOURCE_CHECK_WGET

21
support/download/wget Executable file
View File

@ -0,0 +1,21 @@
#!/bin/bash
# We want to catch any command failure, and exit immediately
set -e
# Download helper for wget
# Call it with:
# $1: URL
# $2: output file
# And this environment:
# WGET : the wget command to call
url="${1}"
output="${2}"
if ${WGET} -O "${output}.tmp" "${url}"; then
mv "${output}.tmp" "${output}"
else
rm -f "${output}.tmp"
exit 1
fi