From: Anthony PERARD <anthony.perard@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Doug Goldstein <cardoe@cardoe.com>
Subject: [XEN PATCH 1/2] automation: Adding ninja-build to some docker images
Date: Wed, 7 Jul 2021 17:40:00 +0100 [thread overview]
Message-ID: <20210707164001.894805-2-anthony.perard@citrix.com> (raw)
In-Reply-To: <20210707164001.894805-1-anthony.perard@citrix.com>
This is to allow building the latest version of QEMU.
fedora/29:
In addition to adding "ninja", I've add to make some other
changes: some `go build` failed with `mkdir /.cache` no
permission, so I've created a user.
(this was discovered while testing the new container with the
script containerize.)
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
automation/build/alpine/3.12.dockerfile | 1 +
automation/build/fedora/29.dockerfile | 9 ++++++---
automation/build/suse/opensuse-leap.dockerfile | 2 ++
automation/build/ubuntu/bionic.dockerfile | 2 ++
automation/build/ubuntu/focal.dockerfile | 2 ++
5 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/automation/build/alpine/3.12.dockerfile b/automation/build/alpine/3.12.dockerfile
index bb8e5ece7414..4ee3ddc12e52 100644
--- a/automation/build/alpine/3.12.dockerfile
+++ b/automation/build/alpine/3.12.dockerfile
@@ -47,6 +47,7 @@ RUN \
apk add glib-dev && \
apk add libattr && \
apk add libcap-ng-dev && \
+ apk add ninja && \
apk add pixman-dev && \
\
# cleanup
diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile
index 027b93ceaf4e..60a5d722668f 100644
--- a/automation/build/fedora/29.dockerfile
+++ b/automation/build/fedora/29.dockerfile
@@ -2,9 +2,6 @@ FROM fedora:29
LABEL maintainer.name="The Xen Project" \
maintainer.email="xen-devel@lists.xenproject.org"
-RUN mkdir /build
-WORKDIR /build
-
# install Xen depends
RUN dnf -y install \
clang \
@@ -43,5 +40,11 @@ RUN dnf -y install \
ocaml \
ocaml-findlib \
golang \
+ # QEMU
+ ninja-build \
&& dnf clean all && \
rm -rf /var/cache/dnf
+
+RUN useradd --create-home user
+USER user
+WORKDIR /build
diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
index 573fbd8ae47e..03f8a7acad4f 100644
--- a/automation/build/suse/opensuse-leap.dockerfile
+++ b/automation/build/suse/opensuse-leap.dockerfile
@@ -67,5 +67,7 @@ RUN zypper install -y --no-recommends \
which \
xz-devel \
zlib-devel \
+ # QEMU
+ ninja \
&& \
zypper clean -a
diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile
index 406a97494caf..1e5a27c70f15 100644
--- a/automation/build/ubuntu/bionic.dockerfile
+++ b/automation/build/ubuntu/bionic.dockerfile
@@ -45,6 +45,8 @@ RUN apt-get update && \
wget \
git \
nasm \
+ # QEMU
+ ninja-build \
&& \
apt-get autoremove -y && \
apt-get clean && \
diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile
index 952a3172aa64..74655b9876d2 100644
--- a/automation/build/ubuntu/focal.dockerfile
+++ b/automation/build/ubuntu/focal.dockerfile
@@ -44,6 +44,8 @@ RUN apt-get update && \
wget \
git \
nasm \
+ # QEMU
+ ninja-build \
&& \
apt-get autoremove -y && \
apt-get clean && \
--
Anthony PERARD
next prev parent reply other threads:[~2021-07-07 16:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-07 16:39 [XEN PATCH 0/2] automation: Fix build with new qemu-xen version Anthony PERARD
2021-07-07 16:40 ` Anthony PERARD [this message]
2021-07-07 16:40 ` [XEN PATCH 2/2] automation: Check if ninja is available before building QEMU Anthony PERARD
2021-07-07 17:46 ` Andrew Cooper
2021-07-07 19:52 ` Olaf Hering
2021-07-07 22:44 ` Andrew Cooper
2021-07-08 0:29 ` Olaf Hering
2021-07-07 20:35 ` Olaf Hering
2021-07-07 22:47 ` Andrew Cooper
2021-07-08 0:32 ` Olaf Hering
2021-07-08 12:23 ` Olaf Hering
2021-07-08 12:51 ` Andrew Cooper
2021-07-08 14:20 ` Olaf Hering
2021-07-08 10:52 ` Anthony PERARD
2021-07-08 11:23 ` Andrew Cooper
2021-07-08 11:30 ` Anthony PERARD
2021-07-07 17:23 ` [XEN PATCH 0/2] automation: Fix build with new qemu-xen version Anthony PERARD
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210707164001.894805-2-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=cardoe@cardoe.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).