[PATCH v2 01/45] WIP: gitlab: Install pyelftools

[PATCH v2 01/45] WIP: gitlab: Install pyelftools

[Simon Glass]

This should not need to be applied if the Dockerfile update is taken.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Move the gitlab change into an RFC patch

 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7052a6061cb..f5307bc1bc3 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
     - 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
-- 
2.38.0.rc1.362.ged0d419d3c-goog

[PATCH v2 02/45] docker: Install pyelftools for builds

[Simon Glass]

Binman needs this module to build sandbox_vpl and it is needed elsewhere
in CI.

Add it to the docker file.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
- Split the docker change into a separate patch.

 tools/docker/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 84b7777e888..42ab81283d2 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -97,6 +97,7 @@ RUN apt-get update && apt-get install -y \
 	python3 \
 	python3-dev \
 	python3-pip \
+	python3-pyelftools \
 	python3-sphinx \
 	python3-virtualenv \
 	rpm2cpio \
-- 
2.38.0.rc1.362.ged0d419d3c-goog

Re: [PATCH v2 02/45] docker: Install pyelftools for builds

[Heinrich Schuchardt]

On 10/13/22 14:25, Simon Glass wrote:
> Binman needs this module to build sandbox_vpl and it is needed elsewhere
> in CI.
>
> Add it to the docker file.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v2:
> - Split the docker change into a separate patch.
>
>   tools/docker/Dockerfile | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
> index 84b7777e888..42ab81283d2 100644
> --- a/tools/docker/Dockerfile
> +++ b/tools/docker/Dockerfile
> @@ -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

Reviewed-by: Heinrich Schuchardt <xpyron.glpk@gmx.de>


>   	python3-sphinx \
>   	python3-virtualenv \
>   	rpm2cpio \

[PATCH] CI: Update to jammy-20221003-17Oct2022 tag

[Tom Rini]

This includes python3-pyelftools so we can drop it from one of the tests
directly.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 .azure-pipelines.yml | 2 +-
 .gitlab-ci.yml       | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index f200b40dbb24..bda762451fd0 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -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.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7052a6061cb3..6f4c34fc4a3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
-- 
2.25.1

Re: [PATCH v2 02/45] docker: Install pyelftools for builds

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

On Thu, Oct 13, 2022 at 06:25:57AM -0600, Simon Glass wrote:

> Binman needs this module to build sandbox_vpl and it is needed elsewhere
> in CI.
> 
> Add it to the docker file.
> 
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Heinrich Schuchardt <xpyron.glpk@gmx.de>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH] CI: Update to jammy-20221003-17Oct2022 tag

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

On Mon, Oct 17, 2022 at 11:16:59AM -0400, Tom Rini wrote:

> This includes python3-pyelftools so we can drop it from one of the tests
> directly.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]