From e43b32157b3df8dccfcb3b49dda1171a3114a654 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Mon, 27 Jun 2022 16:58:15 +0200
Subject: [PATCH] bitbake-builder: Remove flex and bison host OS tools
We will be using flex-native and bison-native recipes instead from now on.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
.gitlab-ci/container.yml | 2 +-
.gitlab-ci/container/bitbake-builder/Dockerfile | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci/container.yml b/.gitlab-ci/container.yml
index 99d76e8f..8c3cf40a 100644
--- a/.gitlab-ci/container.yml
+++ b/.gitlab-ci/container.yml
@@ -14,7 +14,7 @@
# limitations under the License.
variables:
- BITBAKE_CONTAINER_VERSION: "0.6"
+ BITBAKE_CONTAINER_VERSION: "0.7"
OPENHARMONY_CONTAINER_VERSION: "0.1"
.kaniko:
diff --git a/.gitlab-ci/container/bitbake-builder/Dockerfile b/.gitlab-ci/container/bitbake-builder/Dockerfile
index c5285ac0..0a2f61a6 100644
--- a/.gitlab-ci/container/bitbake-builder/Dockerfile
+++ b/.gitlab-ci/container/bitbake-builder/Dockerfile
@@ -28,7 +28,6 @@ COPY --chown=root:root ppa/zyga-ubuntu-oh-tools.gpg /etc/apt/trusted.gpg.d/
RUN eatmydata apt-get update -qq \
&& eatmydata apt-get install -qq -y \
bash git-repo apt-utils build-essential chrpath cpio diffstat gawk git sudo wget \
- flex bison \
language-pack-en-base time locales python-is-python3 python3-distutils libssl-dev \
iproute2 iputils-ping curl jq ca-certificates git-lfs \
lz4 zstd git-restore-mtime \
--
GitLab