[PATCH v1] automation: provide diffutils and ghostscript in opensuse images

Olaf Hering posted 1 patch 1 year ago
Failed in applying to current master (apply log)
automation/build/suse/opensuse-leap.dockerfile       | 2 ++
automation/build/suse/opensuse-tumbleweed.dockerfile | 2 ++
2 files changed, 4 insertions(+)
[PATCH v1] automation: provide diffutils and ghostscript in opensuse images
Posted by Olaf Hering 1 year ago
The diffutils package is a hard requirement for building xen.
It was dropped from the Tumbleweed base image in the past 12 months.

Building with --enable-docs does now require the gs tool.

Add both packages to the suse dockerfiles.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
 automation/build/suse/opensuse-leap.dockerfile       | 2 ++
 automation/build/suse/opensuse-tumbleweed.dockerfile | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
index bac9385412..c7973dd6ab 100644
--- a/automation/build/suse/opensuse-leap.dockerfile
+++ b/automation/build/suse/opensuse-leap.dockerfile
@@ -18,11 +18,13 @@ RUN zypper install -y --no-recommends \
         clang \
         cmake \
         dev86 \
+        diffutils \
         discount \
         flex \
         gcc \
         gcc-c++ \
         git \
+        ghostscript \
         glib2-devel \
         glibc-devel \
         # glibc-devel-32bit for Xen < 4.15
diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
index 3e5771fccd..7e5f22acef 100644
--- a/automation/build/suse/opensuse-tumbleweed.dockerfile
+++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
@@ -18,11 +18,13 @@ RUN zypper install -y --no-recommends \
         clang \
         cmake \
         dev86 \
+        diffutils \
         discount \
         flex \
         gcc \
         gcc-c++ \
         git \
+        ghostscript \
         glib2-devel \
         glibc-devel \
         # glibc-devel-32bit for Xen < 4.15
Re: [PATCH v1] automation: provide diffutils and ghostscript in opensuse images
Posted by Stefano Stabellini 11 months, 3 weeks ago
On Tue, 2 May 2023, Olaf Hering wrote:
> The diffutils package is a hard requirement for building xen.
> It was dropped from the Tumbleweed base image in the past 12 months.
> 
> Building with --enable-docs does now require the gs tool.
> 
> Add both packages to the suse dockerfiles.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
>  automation/build/suse/opensuse-leap.dockerfile       | 2 ++
>  automation/build/suse/opensuse-tumbleweed.dockerfile | 2 ++
>  2 files changed, 4 insertions(+)
> 
> diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
> index bac9385412..c7973dd6ab 100644
> --- a/automation/build/suse/opensuse-leap.dockerfile
> +++ b/automation/build/suse/opensuse-leap.dockerfile
> @@ -18,11 +18,13 @@ RUN zypper install -y --no-recommends \
>          clang \
>          cmake \
>          dev86 \
> +        diffutils \
>          discount \
>          flex \
>          gcc \
>          gcc-c++ \
>          git \
> +        ghostscript \
>          glib2-devel \
>          glibc-devel \
>          # glibc-devel-32bit for Xen < 4.15
> diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
> index 3e5771fccd..7e5f22acef 100644
> --- a/automation/build/suse/opensuse-tumbleweed.dockerfile
> +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
> @@ -18,11 +18,13 @@ RUN zypper install -y --no-recommends \
>          clang \
>          cmake \
>          dev86 \
> +        diffutils \
>          discount \
>          flex \
>          gcc \
>          gcc-c++ \
>          git \
> +        ghostscript \
>          glib2-devel \
>          glibc-devel \
>          # glibc-devel-32bit for Xen < 4.15
>