36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
|
From 96df1be5fee763f54db9f50466f4ccf433c48ea1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: jianchunfu <jianchunfu_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 30 Nov 2022 14:33:12 +0800
|
||
|
|
Subject: [PATCH 03/17] Add flex/bison to `debian-hexagon-cross`
|
||
|
|
|
||
|
|
debian-hexagon-cross contains two images, one to build the toolchain
|
||
|
|
used for building the Hexagon tests themselves, and one image to build
|
||
|
|
QEMU and run the tests.
|
||
|
|
This commit adds flex/bison to the final image that builds QEMU so that
|
||
|
|
it can also build idef-parser.
|
||
|
|
Note: This container is not built by the CI and needs to be rebuilt and
|
||
|
|
updated manually.
|
||
|
|
|
||
|
|
Signed-off-by: Anton Johansson <anjo@rev.ng>
|
||
|
|
Signed-off-by: jianchunfu <jianchunfu_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
tests/docker/dockerfiles/debian-hexagon-cross.docker | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker
|
||
|
|
index d5dc299dc1..a64e950f07 100644
|
||
|
|
--- a/tests/docker/dockerfiles/debian-hexagon-cross.docker
|
||
|
|
+++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker
|
||
|
|
@@ -38,7 +38,7 @@ RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.lis
|
||
|
|
# Install QEMU build deps for use in CI
|
||
|
|
RUN apt update && \
|
||
|
|
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
|
||
|
|
- DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy git ninja-build && \
|
||
|
|
+ DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy bison flex git ninja-build && \
|
||
|
|
DEBIAN_FRONTEND=noninteractive eatmydata \
|
||
|
|
apt build-dep -yy --arch-only qemu
|
||
|
|
COPY --from=0 /usr/local /usr/local
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|