From: Xiangyu Chen <[email protected]> backport the changes of templates-use-curl-instead-of-wget.patch from master in following commits:
05f316f70a4d : lxc: update to 5.x and meson 211918936180 : treewide: bulk update patches with status field Signed-off-by: Xiangyu Chen <[email protected]> --- .../templates-use-curl-instead-of-wget.patch | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch index f06e596..ff5c5f6 100644 --- a/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch +++ b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch @@ -1,22 +1,24 @@ -From 1db2db7783bd7ec2aa1da86e640019891634c659 Mon Sep 17 00:00:00 2001 -From: Joakim Roubert <[email protected]> -Date: Fri, 16 Aug 2019 07:52:48 +0200 -Subject: [PATCH] Use curl instead of wget +From 3e4cb0b738649f7750413cefbcfdb2115213ad0d Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <[email protected]> +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. -Change-Id: I4684ae7569704514fdcc63e0655c556efcaf44f8 +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Joakim Roubert <[email protected]> Signed-off-by: Yanfei Xu <[email protected]> +Signed-off-by: Bruce Ashfield <[email protected]> --- - templates/lxc-download.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + 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 -@@ -59,9 +59,9 @@ +diff --git a/templates/lxc-download.in b/templates/lxc-download.in +index a62ddf482..690307338 100755 +--- a/templates/lxc-download.in ++++ b/templates/lxc-download.in +@@ -59,9 +59,9 @@ cleanup() { fi } @@ -28,19 +30,16 @@ Index: git/templates/lxc-download.in return 0 fi done -@@ -70,8 +70,9 @@ +@@ -70,7 +70,7 @@ wget_wrapper() { } download_file() { - 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 [ "$3" = "noexit" ]; then -+ if ! curl_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "https://${DOWNLOAD_SERVER}/$1"; -o "$2" >/dev/null 2>&1; then -+ if ! curl_wrapper --user-agent="lxc/@PACKAGE_VERSION@ compat:${DOWNLOAD_COMPAT_LEVEL}" -m 30 -s "http://${DOWNLOAD_SERVER}/$1"; -o "$2" >/dev/null 2>&1; then -+ if [ "$3" = "noexit" ]; then ++ if ! curl_wrapper --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 - echo "ERROR: Failed to download https://${DOWNLOAD_SERVER}/$1"; 1>&2 -@@ -176,7 +177,7 @@ +@@ -176,7 +176,7 @@ while :; do done # Check for required binaries @@ -49,3 +48,6 @@ Index: git/templates/lxc-download.in if ! command -V "${bin}" >/dev/null 2>&1; then echo "ERROR: Missing required tool: ${bin}" 1>&2 exit 1 +-- +2.25.1 + -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7944): https://lists.yoctoproject.org/g/meta-virtualization/message/7944 Mute This Topic: https://lists.yoctoproject.org/mt/97669933/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
