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 #345

Merged
merged 25 commits into from
Sep 10, 2024
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Sep 8, 2024

See Commits and Changes for more details.


Created by pull[bot]

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

ffainelli and others added 25 commits September 7, 2024 18:49
Add an option to install the firmware file required by the Linux rp2
driver.

Signed-off-by: Florian Fainelli <[email protected]>
[[email protected]: fix indentation in help text]
Signed-off-by: Yann E. MORIN <[email protected]>
Currently, the gdbinit is generated and installed during post install
hooks, either from the gdb package, or from the external-toolchain
package. When using per-package directories (PPD), the staging directory
of the either package is stored in the generated gdbinit, which is not
going to be valid when all the PPD staging dirs get merged into the
final staging: it would lack any library installed afterwards, i.e.
mostly everything would be missing (but the libraries from the C
toolchain in the case of an external toolchain).

Similarly, all the RPATH will point to various PPD drectories. This
does not cause any issue when the final host is aggregated, because the
PPD directories still exist when we call programs from there (e.g. from
the fs infra, or from post-image scripts).

However, we knew that would not always be possible to keep the PPD
directories: we have the prepare-sdk rule that runs a cleanup pass on
the RPATH, and also applies the generic PPD fixups.

When we introduced prepare-sdk in c32ad51 (core/sdk: generate the
SDK tarball ourselves), we did not yet have support for PPD for the host
directory, and especially, we did not have the host-finalize rule, which
was only introduced in d0f4f95 (Makefile: rework main directory
creation logic) which kick-started the introduction of PPD.

At that point, we did not realise that the rpath fixups from
prepare-sdk, would be better moved to the new host-finalize rule,
because that had no impact unless one would need an SDK.

Later, in 25e60fb (Makefile: fix SDK relocation for
per-package-dirs), we eventually introduced the PPD generic fixups in
the prepare-sdk rule. Again, we did not realise that those fixups would
be better placed in the host-finalize rule rather than the prepare-sdk.

While fixing the RPATH in host-finalize is not critical, fixing up the
PPD paths actually is, as the gdbinit case demonstrate.

As such, move the PPD fixups to the host-finalize step, and while at it,
also move the RPATH fixups.

This now does not leave much to do in the prepare-sdk step, and that
could very well be moved to the host-finalize rule as well. However,
some people may have started to rely on prepare-sdk in its 6 years of
existence, and the little script it installs is not needed unless one
really needs an SDK. So leave it as it is for now.

Reported-by: Casey Reeves <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Tested-by: Casey Reeves <[email protected]>
Cc: Thomas Petazzoni <[email protected]>
Cc: Brandon Maier <[email protected]>
Tested-by: Brandon Maier <[email protected]>
Acked-by: TIAN Yuanhao <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Add new python-typing-extensions runtime dependency.

Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Replace deprecated --xslt-config build option with --with-xslt-config.

Replace deprecated --xml2-config build option with --with-xml2-config.

Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
(cherry picked from commit e4a5ab3)
[Peter: drop Makefile/Vagrantfile changes]
Signed-off-by: Peter Korsgaard <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
(cherry picked from commit d9b046e)
[Peter: drop Makefile/Vagrantfile changes]
Signed-off-by: Peter Korsgaard <[email protected]>
Signed-off-by: Peter Korsgaard <[email protected]>
pyproject.toml declared the tzdata package as a required dependency, but
this is in fact only needed on win32. This was fixed upstream [1]. Since
we don't actually check the runtime dependencies from pyproject.toml, we
don't need to do anything in Buildroot.

[1] pydantic/pydantic#10331

Signed-off-by: James Hilliard <[email protected]>
[Arnout: remove tzdata runtime dependency]
Signed-off-by: Arnout Vandecappelle <[email protected]>
Migrate from setuptools-rust to maturin pep517 backend.

License hash changed due to dropping PSF license:
pyca/cryptography@5e6476a

We now need to enable chacha support when building with libopenssl.

Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Arnout Vandecappelle <[email protected]>
While we're at it, also fix the _SOURCE variable so it contains the
-cargo2 suffix. Without this change, the downloaded tarball name
pre-vendoring is the same as post-vendoring and is thus overwritten.
This change was actually done in commit
c617ebb, but then forgotten when the
python-pydantic-core temporarily switched to upstream git instead of
PyPI.

Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Arnout Vandecappelle <[email protected]>
@pull pull bot merged commit 9022c0c into ThomasDevoogdt:master Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants