blob: 76704bb3cd21c50ed7edb9aff68688f2ede6142e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From 3e4cb0b738649f7750413cefbcfdb2115213ad0d Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Date: Sun, 14 Aug 2022 14:08:56 -0400
Subject: [PATCH] download: Use curl instead of wget
When curl's MIT license is preferable to wget's GPLv3.
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Joakim Roubert <joakimr@axis.com>
Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
templates/lxc-download.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: git/templates/lxc-download.in
===================================================================
--- git.orig/templates/lxc-download.in
+++ git/templates/lxc-download.in
@@ -45,9 +45,9 @@
fi
}
-wget_wrapper() {
+curl_wrapper() {
for _ in $(seq 3); do
- if wget "$@"; then
+ if curl "$@"; then
return 0
fi
done
@@ -59,7 +59,7 @@
if [ "${DOWNLOAD_VERBOSE}" = "true" ]; then
echo "Download file: https://${DOWNLOAD_SERVER}$1"
fi
- if ! wget_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then
+ if ! curl_wrapper -L --user-agent "lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then
if [ "$3" = "noexit" ]; then
return 1
else
@@ -167,7 +167,7 @@
done
# Check for required binaries
-for bin in tar xz wget; do
+for bin in tar xz curl; do
if ! command -V "${bin}" >/dev/null 2>&1; then
echo "ERROR: Missing required tool: ${bin}" 1>&2
exit 1
|
