WIP: gitlab: Install pyelftools
PATCH v2 1/45 WIP: gitlab: Install pyelftools
This should not need to be applied if the Dockerfile update is taken.
---
Changes in v2:
- Move the gitlab change into an RFC patch
.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+)
.gitlab-ci.yml +2 -0
@@ -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 - 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
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
PATCH v2 2/45 docker: Install pyelftools for builds
Binman needs this module to build sandbox_vpl and it is needed elsewhere in CI.
Add it to the docker file.
---
Changes in v2:
- Split the docker change into a separate patch.
tools/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+)
tools/docker/Dockerfile +1 -0
@@ -97,6 +97,7 @@ RUN apt-get update && apt-get install -y \ python3 \ python3-dev \ python3-pip \ + python3-pyelftools \ python3-sphinx \ python3-virtualenv \ rpm2cpio \
Signature · 1 line
2.38.0.rc1.362.ged0d419d3c-goog
Re: [PATCH v2 02/45] docker: Install pyelftools for builds
Quoted 19 lines · Simon Glass
Binman needs this module to build
sandbox_vpland it is needed elsewhere in CI.Add it to the docker file.
Signed-off-by Simon Glass <[email protected]>---
Changes in v2:
- Split the docker change into a separate patch.tools/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+)tools/docker/Dockerfile +0
-0
tools/docker/Dockerfile RUN apt-get update && apt-get install -y \ · line 100
Quoted 4 lines
tools/docker/Dockerfile +1
-0@@ -97,6 +97,7 @@ RUN apt-get update && apt-get install -y \ python3 \ python3-dev \ python3-pip \ + python3-pyelftools \
I stumbled upon that package before and you can find it in
https://u-boot.readthedocs.io/en/latest/build/gcc.html#dependencies
Quoted 3 lines
tools/docker/Dockerfile +0
-0python3-sphinx \ python3-virtualenv \ rpm2cpio \
PATCH 1/1 CI: Update to jammy-20221003-17Oct2022 tag
In reply to Simon GlassThis includes python3-pyelftools so we can drop it from one of the tests directly.
--- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)
.azure-pipelines.yml +1 -1
@@ -2,7 +2,7 @@ variables: windows_vm: windows-2019 ubuntu_vm: ubuntu-22.04 macos_vm: macOS-12 - ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20221003-07Oct2022 + ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20221003-17Oct2022 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root.
.gitlab-ci.yml +1 -2
@@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: trini/u-boot-gitlab-ci-runner:jammy-20221003-07Oct2022 +image: trini/u-boot-gitlab-ci-runner:jammy-20221003-17Oct2022 # We run some tests in different order, to catch some failures quicker. stages:
@@ -92,7 +92,6 @@ build all 64bit ARM platforms: script: - virtualenv -p /usr/bin/python3 /tmp/venv - . /tmp/venv/bin/activate - - pip install pyelftools - ret=0; ./tools/buildman/buildman -o /tmp -P -E -W aarch64 || ret=$?; if [[ $ret -ne 0 ]]; then
Signature · 1 line
2.25.1
Re: [PATCH] CI: Update to jammy-20221003-17Oct2022 tag
Quoted 4 lines · Tom Rini
This includes python3-pyelftools so we can drop it from one of the tests directly.
Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH v2 02/45] docker: Install pyelftools for builds
In reply to Simon GlassQuoted 7 lines · Simon Glass
Binman needs this module to build
sandbox_vpland it is needed elsewhere in CI.Add it to the docker file.
Signed-off-by Simon Glass <[email protected]>Reviewed-by Heinrich Schuchardt <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom