Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from buildroot:master #403

Merged
merged 23 commits into from
Dec 22, 2024
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 22, 2024

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

kilian-zinnecker2 and others added 23 commits December 22, 2024 13:21
The Rock 5b board support currently uses a binary trusted firmware
blob from the rockchip-rkbin package. Recently, the Rock 5b's SoC,
i.e., the rk3588, received mainline TrustedFirmware-A support:

https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/21840
https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/29363

This support was recently released as part of the v2.12 version of
the TrustedFirmware-A. This patch changes the defconfig from using
the rockchip-rkbin atf binary blob to building the TrustedFirmware-A
v2.12 for the rk3588 from source.

Signed-off-by: Kilian Zinnecker <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Drop patch which is now upstream.

Replace python-click with python-asyncclick runtime dependency.

Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Add new python-typing-extensions runtime dependency.

Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Drop no longer required python-sniffio runtime dependency.

Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
License hash changed due to year update:
benjaminp/six@8cb688f

Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Since the python-autocommand package has been introduced in commit
b6f3278 ("package/python-autocommand:
new package"), it has consistently been failing to build with:

Traceback (most recent call last):
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 353, in <module>
    main()
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 335, in main
    json_out['return_val'] = hook(**hook_input['kwargs'])
                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/pyproject_hooks/_in_process/_in_process.py", line 118, in get_requires_for_build_wheel
    return hook(config_settings)
           ^^^^^^^^^^^^^^^^^^^^^
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/build_meta.py", line 327, in get_requires_for_build_wheel
    return self._get_build_requires(config_settings, requirements=[])
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/build_meta.py", line 297, in _get_build_requires
    self.run_setup()
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/build_meta.py", line 497, in run_setup
    super().run_setup(setup_script=setup_script)
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/build_meta.py", line 313, in run_setup
    exec(code, locals())
  File "<string>", line 8, in <module>
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/__init__.py", line 108, in setup
    return distutils.core.setup(**attrs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/_distutils/core.py", line 158, in setup
    dist.parse_config_files()
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/dist.py", line 632, in parse_config_files
    pyprojecttoml.apply_configuration(self, filename, ignore_option_errors)
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/config/pyprojecttoml.py", line 71, in apply_configuration
    return _apply(dist, config, filepath)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/config/_apply_pyprojecttoml.py", line 53, in apply
    _apply_project_table(dist, config, root_dir)
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/config/_apply_pyprojecttoml.py", line 79, in _apply_project_table
    corresp(dist, value, root_dir)
  File "/home/autobuild/autobuild/instance-12/output-1/host/lib/python3.12/site-packages/setuptools/config/_apply_pyprojecttoml.py", line 181, in _license
    _set_config(dist, "license", val["text"])
                                 ~~~^^^^^^^^
KeyError: 'text'

This is due to incorrect license information in pyproject.toml. This
was probably missed as the package was merged ~6 months after it was
submitted, so probably at the time it was submitted, it worked fine,
but got broken with more recent versions of setuptools.

Fixes:

  http://autobuild.buildroot.net/results/c9114834eb00569cdb8ec3251ccd5ecfd906c9c9/

Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
@pull pull bot added the ⤵️ pull label Dec 22, 2024
@pull pull bot merged commit 621ebcc into ThomasDevoogdt:master Dec 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants