[meta-virtualization] [sumo] [PATCH v1 1/2] lxc: fixup 'download' template use

[Bruce Ashfield]

merged to sumo

Bruce

On 10/11/2018 04:28 PM, Sinan Kaya wrote:
> From: Mark Asselstine <mark.asselstine at windriver.com>
> 
> We have a new dependency on 'mountpoint' which is now called in the
> download template script. We also hit an upstream bug due to improper
> use of 'mktemp', so we apply a patch to fix this and sent the fix
> upstream as well.
> 
> Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
> Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
> Signed-off-by: Sinan Kaya <okaya at kernel.org>
> ---
>   ...ually-create-DOWNLOAD_TEMP-directory.patch | 39 +++++++++++++++++++
>   recipes-containers/lxc/lxc_2.0.8.bb           |  2 +
>   2 files changed, 41 insertions(+)
>   create mode 100644 recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch
> 
> diff --git a/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch b/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch
> new file mode 100644
> index 0000000..2b1ab87
> --- /dev/null
> +++ b/recipes-containers/lxc/files/templates-actually-create-DOWNLOAD_TEMP-directory.patch
> @@ -0,0 +1,39 @@
> +From 1d83b86a9bf017257c068c662ec3bf52ec0cfe90 Mon Sep 17 00:00:00 2001
> +From: Mark Asselstine <mark.asselstine at windriver.com>
> +Date: Thu, 31 May 2018 16:21:45 -0400
> +Subject: [PATCH] templates: actually create DOWNLOAD_TEMP directory
> +
> +The way 'mktemp' is currently used you will get a temp directory in
> +$TMPDIR or '/tmp' and DOWNLOAD_TEMP will not be pointing to an actual
> +directory. This will result in the wget operations failing and the
> +container will fail to create:
> +
> +    ERROR: Failed to download http://....
> +
> +Instead we want to use the '-p' option for mktemp to set the base path
> +and this will ensure that the temp directory is created in the correct
> +location and DOWNLOAD_TEMP will be consistent with this location.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
> +---
> + templates/lxc-download.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/templates/lxc-download.in b/templates/lxc-download.in
> +index f09475d..d6333ad 100644
> +--- a/templates/lxc-download.in
> ++++ b/templates/lxc-download.in
> +@@ -310,7 +310,7 @@ if ! type mktemp >/dev/null 2>&1; then
> +     DOWNLOAD_TEMP=/tmp/lxc-download.$$
> +     mkdir -p $DOWNLOAD_TEMP
> + else
> +-    DOWNLOAD_TEMP=$(mktemp -d)
> ++    DOWNLOAD_TEMP="$(mktemp -p ${DOWNLOAD_TEMP} -d)"
> + fi
> +
> + # Simply list images
> +--
> +2.19.0
> +
> diff --git a/recipes-containers/lxc/lxc_2.0.8.bb b/recipes-containers/lxc/lxc_2.0.8.bb
> index c87b875..facad2e 100644
> --- a/recipes-containers/lxc/lxc_2.0.8.bb
> +++ b/recipes-containers/lxc/lxc_2.0.8.bb
> @@ -23,6 +23,7 @@ RDEPENDS_${PN} = " \
>   		libidn \
>   		gnutls \
>   		nettle \
> +		util-linux-mountpoint \
>   "
>   
>   RDEPENDS_${PN}_append_libc-glibc = " glibc-utils"
> @@ -38,6 +39,7 @@ SRC_URI = "http://linuxcontainers.org/downloads/${BPN}-${PV}.tar.gz \
>   	file://lxc-doc-upgrade-to-use-docbook-3.1-DTD.patch \
>   	file://logs-optionally-use-base-filenames-to-report-src-fil.patch \
>   	file://cgroups-work-around-issue-in-gcc-7.patch \
> +	file://templates-actually-create-DOWNLOAD_TEMP-directory.patch \
>   	file://dnsmasq.conf \
>   	"
>   
>