* [PATCH] tests/docker: Use binaries for debian-tricore-cross
@ 2023-02-03 14:54 Bastian Koppelmann
2023-02-03 15:02 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 4+ messages in thread
From: Bastian Koppelmann @ 2023-02-03 14:54 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, alex.bennee, philmd
since binutils is pretty old, it fails our CI repeatedly during the
compilation of tricore-binutils. We created a precompiled version using
the debian docker image and download it instead of building it ourself.
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
Peter, I was having trouble with the new version of binutils, I mentioned. I
think this needs more time to sort out. So for now, let's just use a precompiled
version of the current binutils.
.../dockerfiles/debian-tricore-cross.docker | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
index 5ae58efa09..4abcf07e68 100644
--- a/tests/docker/dockerfiles/debian-tricore-cross.docker
+++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
@@ -16,32 +16,20 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
RUN apt update && \
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
- bison \
+ curl \
bzip2 \
ca-certificates \
- ccache \
- flex \
- g++ \
- gcc \
- git \
libglib2.0-dev \
libpixman-1-dev \
locales \
- make \
ninja-build \
pkgconf \
python3-pip \
python3-setuptools \
python3-wheel
-RUN git clone --single-branch \
- https://github.com/bkoppelmann/tricore-binutils.git \
- /usr/src/binutils && \
- cd /usr/src/binutils && chmod +x missing && \
- CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \
- make && make install && \
- rm -rf /usr/src/binutils
-
+RUN curl -#SL https://github.com/bkoppelmann/tricore-binutils/raw/master/release/tricore-binutils.2.13.tar.gz \
+ | tar -xzC /usr/local/
# This image can only build a very minimal QEMU as well as the tests
ENV DEF_TARGET_LIST tricore-softmmu
ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt
--
2.39.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] tests/docker: Use binaries for debian-tricore-cross
2023-02-03 14:54 [PATCH] tests/docker: Use binaries for debian-tricore-cross Bastian Koppelmann
@ 2023-02-03 15:02 ` Philippe Mathieu-Daudé
2023-02-03 15:36 ` Bastian Koppelmann
2023-02-03 15:52 ` Alex Bennée
0 siblings, 2 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-02-03 15:02 UTC (permalink / raw)
To: Bastian Koppelmann, qemu-devel; +Cc: peter.maydell, alex.bennee
Hi Bastian,
On 3/2/23 15:54, Bastian Koppelmann wrote:
> since binutils is pretty old, it fails our CI repeatedly during the
> compilation of tricore-binutils. We created a precompiled version using
> the debian docker image and download it instead of building it ourself.
>
> Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
> ---
> Peter, I was having trouble with the new version of binutils, I mentioned. I
> think this needs more time to sort out. So for now, let's just use a precompiled
> version of the current binutils.
>
> .../dockerfiles/debian-tricore-cross.docker | 18 +++---------------
> 1 file changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
> index 5ae58efa09..4abcf07e68 100644
> --- a/tests/docker/dockerfiles/debian-tricore-cross.docker
> +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
> @@ -16,32 +16,20 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
> RUN apt update && \
> DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
> DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
> - bison \
> + curl \
> bzip2 \
> ca-certificates \
> - ccache \
You might not use ccache, but others do, so please let it:
$ git grep DOCKER_CCACHE
tests/docker/Makefile.include:203:DOCKER_CCACHE_DIR :=
$$HOME/.cache/qemu-docker-ccache
tests/docker/Makefile.include:212: @mkdir -p "$(DOCKER_CCACHE_DIR)"
tests/docker/Makefile.include:234: -v
$(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
> - flex \
> - g++ \
> - gcc \
> - git \
> libglib2.0-dev \
> libpixman-1-dev \
> locales \
> - make \
Why remove gcc/(git)/make?
> ninja-build \
> pkgconf \
> python3-pip \
> python3-setuptools \
> python3-wheel
>
> -RUN git clone --single-branch \
> - https://github.com/bkoppelmann/tricore-binutils.git \
> - /usr/src/binutils && \
> - cd /usr/src/binutils && chmod +x missing && \
> - CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \
> - make && make install && \
> - rm -rf /usr/src/binutils
> -
> +RUN curl -#SL https://github.com/bkoppelmann/tricore-binutils/raw/master/release/tricore-binutils.2.13.tar.gz \
> + | tar -xzC /usr/local/
> # This image can only build a very minimal QEMU as well as the tests
> ENV DEF_TARGET_LIST tricore-softmmu
> ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/docker: Use binaries for debian-tricore-cross
2023-02-03 15:02 ` Philippe Mathieu-Daudé
@ 2023-02-03 15:36 ` Bastian Koppelmann
2023-02-03 15:52 ` Alex Bennée
1 sibling, 0 replies; 4+ messages in thread
From: Bastian Koppelmann @ 2023-02-03 15:36 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-devel, peter.maydell, alex.bennee
Hi Phil,
On Fri, Feb 03, 2023 at 04:02:16PM +0100, Philippe Mathieu-Daudé wrote:
> Hi Bastian,
>
> On 3/2/23 15:54, Bastian Koppelmann wrote:
> > since binutils is pretty old, it fails our CI repeatedly during the
> > compilation of tricore-binutils. We created a precompiled version using
> > the debian docker image and download it instead of building it ourself.
> >
> > Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
> > ---
> > Peter, I was having trouble with the new version of binutils, I mentioned. I
> > think this needs more time to sort out. So for now, let's just use a precompiled
> > version of the current binutils.
> >
> > .../dockerfiles/debian-tricore-cross.docker | 18 +++---------------
> > 1 file changed, 3 insertions(+), 15 deletions(-)
> >
> > diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker
> > index 5ae58efa09..4abcf07e68 100644
> > --- a/tests/docker/dockerfiles/debian-tricore-cross.docker
> > +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
> > @@ -16,32 +16,20 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
> > RUN apt update && \
> > DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
> > DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
> > - bison \
> > + curl \
> > bzip2 \
> > ca-certificates \
> > - ccache \
>
> You might not use ccache, but others do, so please let it:
>
> $ git grep DOCKER_CCACHE
> tests/docker/Makefile.include:203:DOCKER_CCACHE_DIR :=
> $$HOME/.cache/qemu-docker-ccache
> tests/docker/Makefile.include:212: @mkdir -p "$(DOCKER_CCACHE_DIR)"
> tests/docker/Makefile.include:234: -v
> $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
>
> > - flex \
> > - g++ \
> > - gcc \
> > - git \
> > libglib2.0-dev \
> > libpixman-1-dev \
> > locales \
> > - make \
>
> Why remove gcc/(git)/make?
I'm not cloning any repository and not building anything. Why download things, if we
don't need them?
Anyways, if you prefer, then I can revert the changes to the installed packages.
Cheers,
Bastian
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tests/docker: Use binaries for debian-tricore-cross
2023-02-03 15:02 ` Philippe Mathieu-Daudé
2023-02-03 15:36 ` Bastian Koppelmann
@ 2023-02-03 15:52 ` Alex Bennée
1 sibling, 0 replies; 4+ messages in thread
From: Alex Bennée @ 2023-02-03 15:52 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Bastian Koppelmann, qemu-devel, peter.maydell
Philippe Mathieu-Daudé <philmd@linaro.org> writes:
> Hi Bastian,
>
> On 3/2/23 15:54, Bastian Koppelmann wrote:
>> since binutils is pretty old, it fails our CI repeatedly during the
>> compilation of tricore-binutils. We created a precompiled version using
>> the debian docker image and download it instead of building it ourself.
>> Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
>> ---
>> Peter, I was having trouble with the new version of binutils, I mentioned. I
>> think this needs more time to sort out. So for now, let's just use a precompiled
>> version of the current binutils.
>> .../dockerfiles/debian-tricore-cross.docker | 18
>> +++---------------
>> 1 file changed, 3 insertions(+), 15 deletions(-)
>> diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker
>> b/tests/docker/dockerfiles/debian-tricore-cross.docker
>> index 5ae58efa09..4abcf07e68 100644
>> --- a/tests/docker/dockerfiles/debian-tricore-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker
>> @@ -16,32 +16,20 @@ MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
>> RUN apt update && \
>> DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
>> DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
>> - bison \
>> + curl \
>> bzip2 \
>> ca-certificates \
>> - ccache \
>
> You might not use ccache, but others do, so please let it:
>
> $ git grep DOCKER_CCACHE
> tests/docker/Makefile.include:203:DOCKER_CCACHE_DIR :=
> $$HOME/.cache/qemu-docker-ccache
> tests/docker/Makefile.include:212: @mkdir -p "$(DOCKER_CCACHE_DIR)"
> tests/docker/Makefile.include:234: -v
> $(DOCKER_CCACHE_DIR):/var/tmp/ccache:z \
>
>> - flex \
>> - g++ \
>> - gcc \
>> - git \
>> libglib2.0-dev \
>> libpixman-1-dev \
>> locales \
>> - make \
>
> Why remove gcc/(git)/make?
In retrospect 39ce923732 (gitlab: enable a very minimal build with the
tricore container) could have made the minimal qemu build requirements
clearer in the comment text at the top of the container.
>
>> ninja-build \
>> pkgconf \
>> python3-pip \
>> python3-setuptools \
>> python3-wheel
>> -RUN git clone --single-branch \
>> - https://github.com/bkoppelmann/tricore-binutils.git \
>> - /usr/src/binutils && \
>> - cd /usr/src/binutils && chmod +x missing && \
>> - CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \
>> - make && make install && \
>> - rm -rf /usr/src/binutils
>> -
>> +RUN curl -#SL https://github.com/bkoppelmann/tricore-binutils/raw/master/release/tricore-binutils.2.13.tar.gz \
>> + | tar -xzC /usr/local/
>> # This image can only build a very minimal QEMU as well as the tests
>> ENV DEF_TARGET_LIST tricore-softmmu
>> ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-03 15:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-03 14:54 [PATCH] tests/docker: Use binaries for debian-tricore-cross Bastian Koppelmann
2023-02-03 15:02 ` Philippe Mathieu-Daudé
2023-02-03 15:36 ` Bastian Koppelmann
2023-02-03 15:52 ` Alex Bennée
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).