Re: [PATCH] templates/lxc-download.in: Use curl instead of wget

[Bruce Ashfield <bruce.ashfield@gmail.com>]

merged

Bruce

In message: [meta-virtualization] [PATCH] templates/lxc-download.in: Use curl instead of wget
on 17/09/2019 Joakim Roubert wrote:

> When curl's MIT license is preferable to wget's GPLv3. Which it is in
> several situations.
> 
> Change-Id: I72ee1ce66493c564557b73fae80f5219ef83af6d
> Signed-off-by: Joakim Roubert <joakimr@axis.com>
> ---
>  .../templates-use-curl-instead-of-wget.patch  | 49 +++++++++++++++++++
>  recipes-containers/lxc/lxc_3.2.1.bb           |  3 +-
>  2 files changed, 51 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch
> 
> 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
> new file mode 100644
> index 0000000..4b185bf
> --- /dev/null
> +++ b/recipes-containers/lxc/files/templates-use-curl-instead-of-wget.patch
> @@ -0,0 +1,49 @@
> +From dd7b0a2e4542c352456747a45d7eeb11e9fdec26 Mon Sep 17 00:00:00 2001
> +From: Joakim Roubert <joakimr@axis.com>
> +Date: Fri, 16 Aug 2019 07:52:48 +0200
> +Subject: [PATCH] Use curl instead of wget
> +
> +When curl's MIT license is preferable to wget's GPLv3.
> +
> +Change-Id: I4684ae7569704514fdcc63e0655c556efcaf44f8
> +Signed-off-by: Joakim Roubert <joakimr@axis.com>
> +---
> + templates/lxc-download.in | 10 +++++-----
> + 1 file changed, 5 insertions(+), 5 deletions(-)
> +
> +diff --git a/templates/lxc-download.in b/templates/lxc-download.in
> +index b70daaf..9526eae 100644
> +--- a/templates/lxc-download.in
> ++++ b/templates/lxc-download.in
> +@@ -74,9 +74,9 @@ cleanup() {
> +   fi
> + }
> + 
> +-wget_wrapper() {
> ++curl_wrapper() {
> +   for _ in $(seq 3); do
> +-    if wget "$@"; then
> ++    if curl "$@"; then
> +       return 0
> +     fi
> +   done
> +@@ -85,8 +85,8 @@ wget_wrapper() {
> + }
> + 
> + download_file() {
> +-  if ! wget_wrapper -T 30 -q "https://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then
> +-    if ! wget_wrapper -T 30 -q "http://${DOWNLOAD_SERVER}/$1" -O "$2" >/dev/null 2>&1; then
> ++  if ! curl_wrapper -m 30 -s "https://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then
> ++    if ! curl_wrapper -m 30 -s "http://${DOWNLOAD_SERVER}/$1" -o "$2" >/dev/null 2>&1; then
> +       if [ "$3" = "noexit" ]; then
> +         return 1
> +       else
> +@@ -266,7 +266,7 @@ while :; do
> + 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
> diff --git a/recipes-containers/lxc/lxc_3.2.1.bb b/recipes-containers/lxc/lxc_3.2.1.bb
> index 4b8f10b..b852515 100644
> --- a/recipes-containers/lxc/lxc_3.2.1.bb
> +++ b/recipes-containers/lxc/lxc_3.2.1.bb
> @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
>  DEPENDS = "libxml2 libcap"
>  RDEPENDS_${PN} = " \
>  		rsync \
> +		curl \
>  		gzip \
>  		xz \
>  		tar \
> -		wget \
>  		libcap-bin \
>  		bridge-utils \
>  		dnsmasq \
> @@ -41,6 +41,7 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
>  	file://logs-optionally-use-base-filenames-to-report-src-fil.patch \
>  	file://templates-actually-create-DOWNLOAD_TEMP-directory.patch \
>  	file://template-make-busybox-template-compatible-with-core-.patch \
> +	file://templates-use-curl-instead-of-wget.patch \
>  	file://tests-our-init-is-not-busybox.patch \
>  	file://tests-add-no-validate-when-using-download-template.patch \
>  	file://network-restore-ability-to-move-nl80211-devices.patch \
> -- 
> 2.20.1
> 
> -- 
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization