* [PATCH v2 1/4] automation: install texinfo
2018-07-09 15:32 [PATCH v2 0/4] Improvement to docker-based build automation Wei Liu
@ 2018-07-09 15:32 ` Wei Liu
2018-07-09 17:14 ` Doug Goldstein
2018-07-09 15:32 ` [PATCH v2 2/4] automation: install some packages for CentOS from EPEL Wei Liu
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: Wei Liu @ 2018-07-09 15:32 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Doug Goldstein
Stubdom's dependency newlib needs it.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
automation/build/centos/7.2.dockerfile | 1 +
automation/build/debian/jessie.dockerfile | 1 +
automation/build/debian/stretch.dockerfile | 1 +
automation/build/ubuntu/trusty.dockerfile | 1 +
automation/build/ubuntu/xenial.dockerfile | 1 +
5 files changed, 5 insertions(+)
diff --git a/automation/build/centos/7.2.dockerfile b/automation/build/centos/7.2.dockerfile
index c6a1f46d3c..34eac9abd4 100644
--- a/automation/build/centos/7.2.dockerfile
+++ b/automation/build/centos/7.2.dockerfile
@@ -39,4 +39,5 @@ RUN rpm --rebuilddb && \
python-markdown \
patch \
checkpolicy \
+ texinfo \
&& yum clean all
diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile
index 9bb1bdf104..3377a63334 100644
--- a/automation/build/debian/jessie.dockerfile
+++ b/automation/build/debian/jessie.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && \
checkpolicy \
wget \
git \
+ texinfo \
&& \
apt-get autoremove -y && \
apt-get clean && \
diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
index f068457ab6..3d3f140737 100644
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && \
checkpolicy \
wget \
git \
+ texinfo \
&& \
apt-get autoremove -y && \
apt-get clean && \
diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile
index cc750873e3..de173891a7 100644
--- a/automation/build/ubuntu/trusty.dockerfile
+++ b/automation/build/ubuntu/trusty.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && \
checkpolicy \
wget \
git \
+ texinfo \
&& \
apt-get autoremove -y && \
apt-get clean && \
diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/ubuntu/xenial.dockerfile
index aa551c1b5c..76a923fb97 100644
--- a/automation/build/ubuntu/xenial.dockerfile
+++ b/automation/build/ubuntu/xenial.dockerfile
@@ -41,6 +41,7 @@ RUN apt-get update && \
checkpolicy \
wget \
git \
+ texinfo \
&& \
apt-get autoremove -y && \
apt-get clean && \
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 2/4] automation: install some packages for CentOS from EPEL
2018-07-09 15:32 [PATCH v2 0/4] Improvement to docker-based build automation Wei Liu
2018-07-09 15:32 ` [PATCH v2 1/4] automation: install texinfo Wei Liu
@ 2018-07-09 15:32 ` Wei Liu
2018-07-09 16:46 ` Doug Goldstein
2018-07-09 15:32 ` [PATCH v2 3/4] automation: introduce stretch-i386.dockerfile Wei Liu
2018-07-09 15:32 ` [PATCH v2 4/4] automation: build more stuff on x86 with docker Wei Liu
3 siblings, 1 reply; 11+ messages in thread
From: Wei Liu @ 2018-07-09 15:32 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Doug Goldstein
They are needed to build tools.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
automation/build/centos/7.2.dockerfile | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/automation/build/centos/7.2.dockerfile b/automation/build/centos/7.2.dockerfile
index 34eac9abd4..f46a5e3f2b 100644
--- a/automation/build/centos/7.2.dockerfile
+++ b/automation/build/centos/7.2.dockerfile
@@ -6,6 +6,9 @@ LABEL maintainer.name="The Xen Project" \
# the version we want
COPY CentOS-7.2.repo /etc/yum.repos.d/CentOS-Base.repo
+# install EPEL for dev86, xz-devel and possibly other packages
+RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
RUN mkdir /build
WORKDIR /build
@@ -40,4 +43,7 @@ RUN rpm --rebuilddb && \
patch \
checkpolicy \
texinfo \
+ dev86 \
+ xz-devel \
+ bzip2 \
&& yum clean all
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH v2 2/4] automation: install some packages for CentOS from EPEL
2018-07-09 15:32 ` [PATCH v2 2/4] automation: install some packages for CentOS from EPEL Wei Liu
@ 2018-07-09 16:46 ` Doug Goldstein
2018-07-10 7:16 ` Wei Liu
0 siblings, 1 reply; 11+ messages in thread
From: Doug Goldstein @ 2018-07-09 16:46 UTC (permalink / raw)
To: Wei Liu; +Cc: Xen-devel
On Mon, Jul 09, 2018 at 04:32:14PM +0100, Wei Liu wrote:
> They are needed to build tools.
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> automation/build/centos/7.2.dockerfile | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/automation/build/centos/7.2.dockerfile b/automation/build/centos/7.2.dockerfile
> index 34eac9abd4..f46a5e3f2b 100644
> --- a/automation/build/centos/7.2.dockerfile
> +++ b/automation/build/centos/7.2.dockerfile
> @@ -6,6 +6,9 @@ LABEL maintainer.name="The Xen Project" \
> # the version we want
> COPY CentOS-7.2.repo /etc/yum.repos.d/CentOS-Base.repo
>
> +# install EPEL for dev86, xz-devel and possibly other packages
> +RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
"&& yum clean all" to keep the layer size down
With that added in there (unless Acked-by is more appropriate):
Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 2/4] automation: install some packages for CentOS from EPEL
2018-07-09 16:46 ` Doug Goldstein
@ 2018-07-10 7:16 ` Wei Liu
0 siblings, 0 replies; 11+ messages in thread
From: Wei Liu @ 2018-07-10 7:16 UTC (permalink / raw)
To: Doug Goldstein; +Cc: Xen-devel, Wei Liu
On Mon, Jul 09, 2018 at 11:46:59AM -0500, Doug Goldstein wrote:
> On Mon, Jul 09, 2018 at 04:32:14PM +0100, Wei Liu wrote:
> > They are needed to build tools.
> >
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > ---
> > automation/build/centos/7.2.dockerfile | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/automation/build/centos/7.2.dockerfile b/automation/build/centos/7.2.dockerfile
> > index 34eac9abd4..f46a5e3f2b 100644
> > --- a/automation/build/centos/7.2.dockerfile
> > +++ b/automation/build/centos/7.2.dockerfile
> > @@ -6,6 +6,9 @@ LABEL maintainer.name="The Xen Project" \
> > # the version we want
> > COPY CentOS-7.2.repo /etc/yum.repos.d/CentOS-Base.repo
> >
> > +# install EPEL for dev86, xz-devel and possibly other packages
> > +RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
>
> "&& yum clean all" to keep the layer size down
>
> With that added in there (unless Acked-by is more appropriate):
Either is fine.
>
> Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
Thanks.
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 3/4] automation: introduce stretch-i386.dockerfile
2018-07-09 15:32 [PATCH v2 0/4] Improvement to docker-based build automation Wei Liu
2018-07-09 15:32 ` [PATCH v2 1/4] automation: install texinfo Wei Liu
2018-07-09 15:32 ` [PATCH v2 2/4] automation: install some packages for CentOS from EPEL Wei Liu
@ 2018-07-09 15:32 ` Wei Liu
2018-07-09 17:16 ` Doug Goldstein
2018-07-09 15:32 ` [PATCH v2 4/4] automation: build more stuff on x86 with docker Wei Liu
3 siblings, 1 reply; 11+ messages in thread
From: Wei Liu @ 2018-07-09 15:32 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Doug Goldstein
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
automation/build/debian/stretch-i386.dockerfile | 50 +++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 automation/build/debian/stretch-i386.dockerfile
diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile
new file mode 100644
index 0000000000..add2204535
--- /dev/null
+++ b/automation/build/debian/stretch-i386.dockerfile
@@ -0,0 +1,50 @@
+FROM i386/debian:stretch
+LABEL maintainer.name="The Xen Project" \
+ maintainer.email="xen-devel@lists.xenproject.org"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+
+RUN mkdir /build
+WORKDIR /build
+
+ENTRYPOINT ["/usr/bin/setarch", "i686", "/bin/bash"]
+
+# build depends
+RUN apt-get update && \
+ apt-get --quiet --yes install \
+ build-essential \
+ zlib1g-dev \
+ libncurses5-dev \
+ libssl-dev \
+ python2.7-dev \
+ xorg-dev \
+ uuid-dev \
+ libyajl-dev \
+ libaio-dev \
+ libglib2.0-dev \
+ clang \
+ libpixman-1-dev \
+ pkg-config \
+ flex \
+ bison \
+ gettext \
+ acpica-tools \
+ bin86 \
+ bcc \
+ liblzma-dev \
+ libc6-dev \
+ libnl-3-dev \
+ ocaml-nox \
+ libfindlib-ocaml-dev \
+ markdown \
+ transfig \
+ pandoc \
+ checkpolicy \
+ wget \
+ git \
+ texinfo \
+ && \
+ apt-get autoremove -y && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 4/4] automation: build more stuff on x86 with docker
2018-07-09 15:32 [PATCH v2 0/4] Improvement to docker-based build automation Wei Liu
` (2 preceding siblings ...)
2018-07-09 15:32 ` [PATCH v2 3/4] automation: introduce stretch-i386.dockerfile Wei Liu
@ 2018-07-09 15:32 ` Wei Liu
2018-07-09 17:18 ` Doug Goldstein
3 siblings, 1 reply; 11+ messages in thread
From: Wei Liu @ 2018-07-09 15:32 UTC (permalink / raw)
To: Xen-devel; +Cc: Wei Liu, Doug Goldstein
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Untested
---
automation/scripts/build | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/automation/scripts/build b/automation/scripts/build
index b90fc43d26..b9e4c1e329 100755
--- a/automation/scripts/build
+++ b/automation/scripts/build
@@ -11,8 +11,6 @@ fi
# build up our configure options
cfgargs=()
-cfgargs+=("--disable-stubdom") # more work needed into building this
-cfgargs+=("--disable-rombios")
cfgargs+=("--enable-docs")
# SeaBIOS cannot be built with clang
@@ -20,9 +18,7 @@ if [[ "${CC}" == "clang" ]]; then
cfgargs+=("--with-system-seabios=/usr/share/seabios/bios.bin")
fi
-if [[ "${XEN_TARGET_ARCH}" == "x86_64" ]]; then
- cfgargs+=("--enable-tools")
-else
+if [[ "${XEN_TARGET_ARCH}" == "arm64" || "${XEN_TARGET_ARCH}" == "arm32" ]]; then
cfgargs+=("--disable-tools") # we don't have the cross depends installed
fi
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 11+ messages in thread