qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] tests/docker: Use binaries for debian-tricore-cross


From: Bastian Koppelmann
Subject: [PATCH] tests/docker: Use binaries for debian-tricore-cross
Date: Fri, 3 Feb 2023 15:54:04 +0100

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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]