On 9/25/22 17:02, Simon Glass wrote:
Binman needs this module to build sandbox_vpl so install it in the before_script and in the world build. The existing pip install is too late for the buildman invocation.
Add it to the docker file for the future.
Signed-off-by: Simon Glass sjg@chromium.org
.gitlab-ci.yml | 2 ++ tools/docker/Dockerfile | 1 + 2 files changed, 3 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8e94bf8d4e8..47e36edcc4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,7 @@ stages: # If we've been asked to use clang only do one configuration. - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD} - echo BUILD_ENV ${BUILD_ENV}
- pip install pyelftools
Why do we need pip install here? Is pyelftools used outside the Docker image to which you add pyelftools below?
Best regards
Heinrich
- tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W -e --board ${TEST_PY_BD} ${OVERRIDE} - cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/@@ -113,6 +114,7 @@ build all PowerPC platforms: build all other platforms: stage: world build script:
- pip install pyelftools
- ret=0; ./tools/buildman/buildman -o /tmp -P -E -W -x arm,powerpc || ret=$?; if [[ $ret -ne 0 ]]; then
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index d3292e752a9..6fd7da66603 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -96,6 +96,7 @@ RUN apt-get update && apt-get install -y \ python3 \ python3-dev \ python3-pip \
- python3-pyelftools \ python3-sphinx \ python3-virtualenv \ rpm2cpio \