motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-15 22:21:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildsys: Remove CRIS cross container

Browse source 
We removed the cross compiled CRIS tests in the previous commit.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Message-ID: <20240904143603.52934-4-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-07-24 13:47:57 +02:00
parent 0024b62a21
commit 5fce444152
4 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.d/container-cross.yml
View file

@ -90,11 +90,6 @@ xtensa-debian-cross-container:
variables: variables:
NAME: debian-xtensa-cross NAME: debian-xtensa-cross
cris-fedora-cross-container:
extends: .container_job_template
variables:
NAME: fedora-cris-cross
win64-fedora-cross-container: win64-fedora-cross-container:
extends: .container_job_template extends: .container_job_template
variables: variables:

4
configure vendored
View file

@ -1250,7 +1250,6 @@ probe_target_compiler() {
aarch64) container_hosts="x86_64 aarch64" ;; aarch64) container_hosts="x86_64 aarch64" ;;
alpha) container_hosts=x86_64 ;; alpha) container_hosts=x86_64 ;;
arm) container_hosts="x86_64 aarch64" ;; arm) container_hosts="x86_64 aarch64" ;;
cris) container_hosts=x86_64 ;;
hexagon) container_hosts=x86_64 ;; hexagon) container_hosts=x86_64 ;;
hppa) container_hosts=x86_64 ;; hppa) container_hosts=x86_64 ;;
i386) container_hosts=x86_64 ;; i386) container_hosts=x86_64 ;;
@ -1309,9 +1308,6 @@ probe_target_compiler() {
container_image=debian-armhf-cross container_image=debian-armhf-cross
container_cross_prefix=arm-linux-gnueabihf- container_cross_prefix=arm-linux-gnueabihf-
;; ;;
cris)
container_image=fedora-cris-cross
;;
hexagon) hexagon)
container_cross_prefix=hexagon-unknown-linux-musl- container_cross_prefix=hexagon-unknown-linux-musl-
container_cross_cc=${container_cross_prefix}clang container_cross_cc=${container_cross_prefix}clang

1
tests/docker/Makefile.include
View file

@ -117,7 +117,6 @@ docker-image-debian-microblaze-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docke
# These images may be good enough for building tests but not for test builds # These images may be good enough for building tests but not for test builds
DOCKER_PARTIAL_IMAGES += debian-microblaze-cross DOCKER_PARTIAL_IMAGES += debian-microblaze-cross
DOCKER_PARTIAL_IMAGES += debian-xtensa-cross DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
DOCKER_PARTIAL_IMAGES += fedora-cris-cross
# images that are only used to build other images # images that are only used to build other images
DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain DOCKER_VIRTUAL_IMAGES := debian-bootstrap debian-toolchain

14
tests/docker/dockerfiles/fedora-cris-cross.docker
View file

@ -1,14 +0,0 @@
#
# Cross compiler for cris system tests
#
FROM registry.fedoraproject.org/fedora:33
ENV PACKAGES gcc-cris-linux-gnu
ENV MAKE /usr/bin/make
RUN dnf install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
# As a final step configure the user (if env is defined)
ARG USER
ARG UID
RUN if [ "${USER}" ]; then \
id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi