[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 08/51] target/hexagon: manually add flex/bison/glib2 to remain
From: |
Alex Bennée |
Subject: |
[PATCH v1 08/51] target/hexagon: manually add flex/bison/glib2 to remaining containers |
Date: |
Thu, 29 Sep 2022 12:41:48 +0100 |
From: Anton Johansson <anjo@rev.ng>
Adds our build-time dependencies to containers which build qemu-hexagon,
but aren't covered by libvirt-ci.
Signed-off-by: Anton Johansson <anjo@rev.ng>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220804115548.13024-11-anjo@rev.ng>
---
.gitlab-ci.d/windows.yml | 6 ++++--
tests/docker/dockerfiles/debian-riscv64-cross.docker | 3 +++
tests/docker/dockerfiles/fedora-i386-cross.docker | 2 ++
tests/docker/dockerfiles/fedora-win32-cross.docker | 3 +++
tests/docker/dockerfiles/fedora-win64-cross.docker | 3 +++
5 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 86a4339c48..70571b29a3 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -33,7 +33,8 @@ msys2-64bit:
extends: .shared_msys2_builder
script:
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
- diffutils git grep make sed
+ bison diffutils flex
+ git grep make sed
mingw-w64-x86_64-capstone
mingw-w64-x86_64-curl
mingw-w64-x86_64-cyrus-sasl
@@ -67,7 +68,8 @@ msys2-32bit:
extends: .shared_msys2_builder
script:
- .\msys64\usr\bin\bash -lc "pacman -Sy --noconfirm --needed
- diffutils git grep make sed
+ bison diffutils flex
+ git grep make sed
mingw-w64-i686-capstone
mingw-w64-i686-curl
mingw-w64-i686-cyrus-sasl
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker
b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index 594d97982c..9715791e0b 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -16,13 +16,16 @@ RUN apt update && \
# Install common build utilities
RUN DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \
+ bison \
bc \
build-essential \
ca-certificates \
debian-ports-archive-keyring \
dpkg-dev \
+ flex \
gettext \
git \
+ libglib2.0-dev \
ninja-build \
pkg-config \
python3
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker
b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 0a3ec346e6..7eec648d2d 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -1,9 +1,11 @@
FROM registry.fedoraproject.org/fedora:34
ENV PACKAGES \
+ bison \
bzip2 \
ccache \
diffutils \
+ flex \
findutils \
gcc \
git \
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker
b/tests/docker/dockerfiles/fedora-win32-cross.docker
index a06bd29e8e..aca37aabc4 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35
# Please keep this list sorted alphabetically
ENV PACKAGES \
bc \
+ bison \
bzip2 \
ccache \
diffutils \
findutils \
+ flex \
gcc \
gettext \
git \
+ glib2-devel \
hostname \
make \
meson \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker
b/tests/docker/dockerfiles/fedora-win64-cross.docker
index b71624330f..3642766479 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -3,13 +3,16 @@ FROM registry.fedoraproject.org/fedora:35
# Please keep this list sorted alphabetically
ENV PACKAGES \
bc \
+ bison \
bzip2 \
ccache \
diffutils \
findutils \
+ flex \
gcc \
gettext \
git \
+ glib2-devel \
hostname \
make \
meson \
--
2.34.1
- [PATCH v1 00/51] maintainer pre-PR (testing, plugins, gitdm, semihosting), Alex Bennée, 2022/09/29
- [PATCH v1 06/51] target/hexagon: add flex/bison/glib2 to qemu.yml, Alex Bennée, 2022/09/29
- [PATCH v1 07/51] target/hexagon: regenerate docker/cirrus files, Alex Bennée, 2022/09/29
- [PATCH v1 03/51] scripts/ci/setup: spice-server only on x86 aarch64, Alex Bennée, 2022/09/29
- [PATCH v1 01/51] scripts/ci/setup: ninja missing from build-environment, Alex Bennée, 2022/09/29
- [PATCH v1 02/51] scripts/ci/setup: Fix libxen requirements, Alex Bennée, 2022/09/29
- [PATCH v1 08/51] target/hexagon: manually add flex/bison/glib2 to remaining containers,
Alex Bennée <=
- [PATCH v1 11/51] tests/qtest: bump up QOS_PATH_MAX_ELEMENT_SIZE, Alex Bennée, 2022/09/29
- [PATCH v1 05/51] configure: move detected gdb to TCG's config-host.mak, Alex Bennée, 2022/09/29
- [PATCH v1 10/51] tests/docker: move alpine from edge to tagged release, Alex Bennée, 2022/09/29
- [PATCH v1 14/51] pc-bios/s390-ccw: detect CC options just once, Alex Bennée, 2022/09/29
- [PATCH v1 12/51] configure: do not invoke as/ld directly for pc-bios/optionrom, Alex Bennée, 2022/09/29
- [PATCH v1 04/51] tests/docker: run script use realpath instead of readlink, Alex Bennée, 2022/09/29
- [PATCH v1 16/51] build: add recursive distclean rules, Alex Bennée, 2022/09/29
- [PATCH v1 28/51] configure: build ROMs with container-based cross compilers, Alex Bennée, 2022/09/29
- [PATCH v1 09/51] tests/docker: update fedora-win[32|64]-cross with lcitool, Alex Bennée, 2022/09/29
- [PATCH v1 13/51] pc-bios/optionrom: detect CC options just once, Alex Bennée, 2022/09/29