diff options
| author | Simon Glass <[email protected]> | 2026-07-05 13:32:18 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-07-06 08:28:50 -0600 |
| commit | d4e3ef0b0ae95406b5c235c06ae8d4b80efdb6c5 (patch) | |
| tree | 1f368ac0ff346ecf824a12b87793ec21a995251b | |
| parent | f6c56009f6600ad87336484d258849d2bf36d010 (diff) | |
CI: Install pylibfdt's requirements in the tool jobs
The GitLab and Azure tool-test and pylint jobs build the pylibfdt
bindings, which need setuptools. That currently comes only from patman's
requirements.txt, which a later patch drops. Install
scripts/dtc/pylibfdt/requirements.txt in those jobs, the proper source
for that dependency, so setuptools survives patman's removal.
Signed-off-by: Simon Glass <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
| -rw-r--r-- | .azure-pipelines.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 4417ef4e5a5..d650f0acbc7 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -164,7 +164,8 @@ stages: -r tools/binman/requirements.txt \ -r tools/buildman/requirements.txt \ -r tools/patman/requirements.txt \ - -r tools/u_boot_pylib/requirements.txt + -r tools/u_boot_pylib/requirements.txt \ + -r scripts/dtc/pylibfdt/requirements.txt export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH} @@ -198,6 +199,7 @@ stages: -r tools/buildman/requirements.txt \ -r tools/patman/requirements.txt \ -r tools/u_boot_pylib/requirements.txt \ + -r scripts/dtc/pylibfdt/requirements.txt \ asteval pylint==3.3.4 pyopenssl export PATH=${PATH}:~/.local/bin echo "[MASTER]" >> .pylintrc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 245e422d72f..6d9b78f5060 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -219,7 +219,8 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt -r tools/binman/requirements.txt -r tools/buildman/requirements.txt -r tools/patman/requirements.txt - -r tools/u_boot_pylib/requirements.txt; + -r tools/u_boot_pylib/requirements.txt + -r scripts/dtc/pylibfdt/requirements.txt; export UBOOT_TRAVIS_BUILD_DIR=/tmp/tools-only; export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; @@ -245,7 +246,8 @@ Run pylint: - . /tmp/venv/bin/activate - pip install -r test/py/requirements.txt -r tools/binman/requirements.txt -r tools/buildman/requirements.txt -r tools/patman/requirements.txt - -r tools/u_boot_pylib/requirements.txt asteval pylint==3.3.4 pyopenssl + -r tools/u_boot_pylib/requirements.txt + -r scripts/dtc/pylibfdt/requirements.txt asteval pylint==3.3.4 pyopenssl - export PATH=${PATH}:~/.local/bin - echo "[MASTER]" >> .pylintrc - echo "load-plugins=pylint.extensions.docparams" >> .pylintrc |