[PATCH] tests/docker: add libfuse3 development headers

Stefan Hajnoczi posted 1 patch 2 years, 4 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20211207160025.52466-1-stefanha@redhat.com
Maintainers: "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Thomas Huth <thuth@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Beraldo Leal <bleal@redhat.com>
tests/docker/dockerfiles/alpine.docker        | 1 +
tests/docker/dockerfiles/centos8.docker       | 1 +
tests/docker/dockerfiles/fedora.docker        | 1 +
tests/docker/dockerfiles/opensuse-leap.docker | 1 +
tests/docker/dockerfiles/ubuntu.docker        | 1 +
tests/docker/dockerfiles/ubuntu2004.docker    | 1 +
6 files changed, 6 insertions(+)
[PATCH] tests/docker: add libfuse3 development headers
Posted by Stefan Hajnoczi 2 years, 4 months ago
The FUSE exports feature is not built because most container images do
not have libfuse3 development headers installed. Add the necessary
packages to the Dockerfiles.

Cc: Hanna Reitz <hreitz@redhat.com>
Cc: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/docker/dockerfiles/alpine.docker        | 1 +
 tests/docker/dockerfiles/centos8.docker       | 1 +
 tests/docker/dockerfiles/fedora.docker        | 1 +
 tests/docker/dockerfiles/opensuse-leap.docker | 1 +
 tests/docker/dockerfiles/ubuntu.docker        | 1 +
 tests/docker/dockerfiles/ubuntu2004.docker    | 1 +
 6 files changed, 6 insertions(+)

diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 7e6997e301..9ddb3c2ebc 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -12,6 +12,7 @@ ENV PACKAGES \
 	ccache \
 	coreutils \
 	curl-dev \
+	fuse3-dev \
 	g++ \
 	gcc \
 	git \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 7f135f8e8c..a2dae4be29 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -19,6 +19,7 @@ ENV PACKAGES \
     device-mapper-multipath-devel \
     diffutils \
     findutils \
+    fuse3-devel \
     gcc \
     gcc-c++ \
     genisoimage \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index c6fd7e1113..a3a712c87b 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -20,6 +20,7 @@ ENV PACKAGES \
     device-mapper-multipath-devel \
     diffutils \
     findutils \
+    fuse3-devel \
     gcc \
     gcc-c++ \
     gcovr \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 3bbdb67f4f..2beb61bd7e 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -15,6 +15,7 @@ ENV PACKAGES \
     dbus-1 \
     diffutils \
     findutils \
+    fuse3-devel \
     gcc \
     gcc-c++ \
     gcovr \
diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
index f0e0180d21..0c694a2bf0 100644
--- a/tests/docker/dockerfiles/ubuntu.docker
+++ b/tests/docker/dockerfiles/ubuntu.docker
@@ -29,6 +29,7 @@ ENV PACKAGES \
     libepoxy-dev \
     libfdt-dev \
     libffi-dev \
+    libfuse3-dev \
     libgbm-dev \
     libgnutls28-dev \
     libgtk-3-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 15a026be09..a46feaecdd 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -34,6 +34,7 @@ ENV PACKAGES \
     libepoxy-dev \
     libfdt-dev \
     libffi-dev \
+    libfuse3-dev \
     libgbm-dev \
     libgcrypt20-dev \
     libglib2.0-dev \
-- 
2.33.1


Re: [PATCH] tests/docker: add libfuse3 development headers
Posted by Richard W.M. Jones 2 years, 4 months ago
On Tue, Dec 07, 2021 at 04:00:25PM +0000, Stefan Hajnoczi wrote:
...
> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
> index 7f135f8e8c..a2dae4be29 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -19,6 +19,7 @@ ENV PACKAGES \
>      device-mapper-multipath-devel \
>      diffutils \
>      findutils \
> +    fuse3-devel \
>      gcc \
>      gcc-c++ \
>      genisoimage \

Just for my own notes, it took me a while to work out that CentOS 8
does have fuse3.  It didn't appear in EPEL 8 etc:

https://src.fedoraproject.org/rpms/fuse3
https://ci.centos.org/search/?q=fuse3

However it turns out it is built from a source package called "fuse"
(version 2.9.7!)  Also I am able to install fuse3 on RHEL 8.  So I
guess that's OK in the end.

The rest of the changes look good too, so:

Acked-by: Richard W.M. Jones <rjones@redhat.com>

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW


Re: [PATCH] tests/docker: add libfuse3 development headers
Posted by Beraldo Leal 2 years, 4 months ago
On Tue, Dec 07, 2021 at 04:00:25PM +0000, Stefan Hajnoczi wrote:
> The FUSE exports feature is not built because most container images do
> not have libfuse3 development headers installed. Add the necessary
> packages to the Dockerfiles.
> 
> Cc: Hanna Reitz <hreitz@redhat.com>
> Cc: Richard W.M. Jones <rjones@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  tests/docker/dockerfiles/alpine.docker        | 1 +
>  tests/docker/dockerfiles/centos8.docker       | 1 +
>  tests/docker/dockerfiles/fedora.docker        | 1 +
>  tests/docker/dockerfiles/opensuse-leap.docker | 1 +
>  tests/docker/dockerfiles/ubuntu.docker        | 1 +
>  tests/docker/dockerfiles/ubuntu2004.docker    | 1 +
>  6 files changed, 6 insertions(+)
> 
> diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
> index 7e6997e301..9ddb3c2ebc 100644
> --- a/tests/docker/dockerfiles/alpine.docker
> +++ b/tests/docker/dockerfiles/alpine.docker
> @@ -12,6 +12,7 @@ ENV PACKAGES \
>  	ccache \
>  	coreutils \
>  	curl-dev \
> +	fuse3-dev \
>  	g++ \
>  	gcc \
>  	git \
> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
> index 7f135f8e8c..a2dae4be29 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -19,6 +19,7 @@ ENV PACKAGES \
>      device-mapper-multipath-devel \
>      diffutils \
>      findutils \
> +    fuse3-devel \
>      gcc \
>      gcc-c++ \
>      genisoimage \
> diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
> index c6fd7e1113..a3a712c87b 100644
> --- a/tests/docker/dockerfiles/fedora.docker
> +++ b/tests/docker/dockerfiles/fedora.docker
> @@ -20,6 +20,7 @@ ENV PACKAGES \
>      device-mapper-multipath-devel \
>      diffutils \
>      findutils \
> +    fuse3-devel \
>      gcc \
>      gcc-c++ \
>      gcovr \
> diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
> index 3bbdb67f4f..2beb61bd7e 100644
> --- a/tests/docker/dockerfiles/opensuse-leap.docker
> +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> @@ -15,6 +15,7 @@ ENV PACKAGES \
>      dbus-1 \
>      diffutils \
>      findutils \
> +    fuse3-devel \
>      gcc \
>      gcc-c++ \
>      gcovr \
> diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker
> index f0e0180d21..0c694a2bf0 100644
> --- a/tests/docker/dockerfiles/ubuntu.docker
> +++ b/tests/docker/dockerfiles/ubuntu.docker
> @@ -29,6 +29,7 @@ ENV PACKAGES \
>      libepoxy-dev \
>      libfdt-dev \
>      libffi-dev \
> +    libfuse3-dev \
>      libgbm-dev \
>      libgnutls28-dev \
>      libgtk-3-dev \
> diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
> index 15a026be09..a46feaecdd 100644
> --- a/tests/docker/dockerfiles/ubuntu2004.docker
> +++ b/tests/docker/dockerfiles/ubuntu2004.docker
> @@ -34,6 +34,7 @@ ENV PACKAGES \
>      libepoxy-dev \
>      libfdt-dev \
>      libffi-dev \
> +    libfuse3-dev \
>      libgbm-dev \
>      libgcrypt20-dev \
>      libglib2.0-dev \

Reviewed-by: Beraldo Leal <bleal@redhat.com>
Tested-by: Beraldo Leal <bleal@redhat.com>

Tested against package names on those repositories.

--
Beraldo


Re: [PATCH] tests/docker: add libfuse3 development headers
Posted by Alex Bennée 2 years, 4 months ago
Stefan Hajnoczi <stefanha@redhat.com> writes:

> The FUSE exports feature is not built because most container images do
> not have libfuse3 development headers installed. Add the necessary
> packages to the Dockerfiles.
>
> Cc: Hanna Reitz <hreitz@redhat.com>
> Cc: Richard W.M. Jones <rjones@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Queued to testing/next, thanks.

-- 
Alex Bennée