[PATCH-for-5.0 v2 2/4] tests/docker: Install gcrypt devel package in Debian image

Philippe Mathieu-Daudé posted 4 patches 5 years, 10 months ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Fam Zheng <fam@euphon.net>
[PATCH-for-5.0 v2 2/4] tests/docker: Install gcrypt devel package in Debian image
Posted by Philippe Mathieu-Daudé 5 years, 10 months ago
In commit 6f8bbb374be we enabled building with the gcrypt library
on the the Debian 'x86 host', which was based on Debian Stretch.
Later in commit 698a71edbed we upgraded the Debian base image to
Buster.

Apparently Debian Stretch was listing gcrypt as a QEMU dependency,
but this is not the case anymore in Buster, so we need to install
it manually (it it not listed by 'apt-get -s build-dep qemu' in
the common debian10.docker anymore). This fixes:

 $ ../configure $QEMU_CONFIGURE_OPTS

  ERROR: User requested feature gcrypt
         configure was not able to find it.
         Install gcrypt devel >= 1.5.0

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2: Reword description, do not use 'Fixes:' tag (Aleksandar)
---
 tests/docker/dockerfiles/debian-amd64.docker | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
index d4849f509f..957f0bc2e7 100644
--- a/tests/docker/dockerfiles/debian-amd64.docker
+++ b/tests/docker/dockerfiles/debian-amd64.docker
@@ -16,6 +16,7 @@ RUN apt update && \
     apt install -y --no-install-recommends \
         libbz2-dev \
         liblzo2-dev \
+        libgcrypt20-dev \
         librdmacm-dev \
         libsasl2-dev \
         libsnappy-dev \
-- 
2.21.1


Re: [PATCH-for-5.0 v2 2/4] tests/docker: Install gcrypt devel package in Debian image
Posted by Philippe Mathieu-Daudé 5 years, 10 months ago
On 3/22/20 1:01 PM, Philippe Mathieu-Daudé wrote:
> In commit 6f8bbb374be we enabled building with the gcrypt library
> on the the Debian 'x86 host', which was based on Debian Stretch.
> Later in commit 698a71edbed we upgraded the Debian base image to
> Buster.

Aleksandar, is this updated description OK with you?

> 
> Apparently Debian Stretch was listing gcrypt as a QEMU dependency,
> but this is not the case anymore in Buster, so we need to install
> it manually (it it not listed by 'apt-get -s build-dep qemu' in
> the common debian10.docker anymore). This fixes:
> 
>   $ ../configure $QEMU_CONFIGURE_OPTS
> 
>    ERROR: User requested feature gcrypt
>           configure was not able to find it.
>           Install gcrypt devel >= 1.5.0
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> v2: Reword description, do not use 'Fixes:' tag (Aleksandar)
> ---
>   tests/docker/dockerfiles/debian-amd64.docker | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker
> index d4849f509f..957f0bc2e7 100644
> --- a/tests/docker/dockerfiles/debian-amd64.docker
> +++ b/tests/docker/dockerfiles/debian-amd64.docker
> @@ -16,6 +16,7 @@ RUN apt update && \
>       apt install -y --no-install-recommends \
>           libbz2-dev \
>           liblzo2-dev \
> +        libgcrypt20-dev \
>           librdmacm-dev \
>           libsasl2-dev \
>           libsnappy-dev \
>