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

Merged
merged 23 commits into from
Jan 15, 2025
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Jan 15, 2025

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 : )

passgat and others added 23 commits January 14, 2025 20:39
This commit bumps the zxing-cpp version to 2.3.0.
For the release note, see:
https://github.com/zxing-cpp/zxing-cpp/releases/tag/v2.3.0

The compilation of this package has been broken since the bump to v2.2.1
when it is compiled with reader support, due to the added patch.

This patch was not added upstream, but another set of more generic
patches [1] that do not change the API were added instead. The error
that the Buildroot patch was fixing no longer exists in 2.3.0.

[1]:
    - zxing-cpp/zxing-cpp@d0c8f22
    - zxing-cpp/zxing-cpp@d979b76

Fixes:
    https://autobuild.buildroot.org/results/ba4573a1bcc0110d4d0b45642e07009ec949d66a/build-end.log

Signed-off-by: Thomas Bonnefille <[email protected]>
Reviewed-by: Dario Binacchi <[email protected]>
[Julien: add link to release note]
Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: Vincent Stehlé <[email protected]>
[Julien: switch to human readable genimage.cfg partition uuid]
Signed-off-by: Julien Olivain <[email protected]>
We need to bypass an unnecessarily strict dependency version check.

Bypasses this error:
* Getting build dependencies for wheel...

ERROR Missing dependencies:
	poetry-core<2,>=1.0.0

Fixes:
 - http://autobuild.buildroot.net/results/0de/0de5b31bc649b97684deaa826e386ada50022d6a
 - https://gitlab.com/buildroot.org/buildroot/-/commit/2ae73dec68c437c2acb32bb76cdeb8cb17f5476a

Signed-off-by: James Hilliard <[email protected]>
[Julien: add link to commit which introduced the issue]
Signed-off-by: Julien Olivain <[email protected]>
For release note, see:
https://github.com/openzfs/zfs/releases/tag/zfs-2.3.0

Signed-off-by: José Luis Salvador Rufo <[email protected]>
[Julien: add link to release note]
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]>
Signed-off-by: James Hilliard <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
…_NEEDS_GCC_AT_LEAST_X guard

BR2_ARCH_NEEDS_GCC_AT_LEAST_X guards has been introduced by [1] to
prevent selecting an external toolchain that did not support the GCC
arch tuning the user had selected.

But it was not updated while updating to version 13.2-rel1.

Fixes: 0dd599d

[1] eed1670

Cc: Antoine Coutant <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
…ARCH_NEEDS_GCC_AT_LEAST_X guard

BR2_ARCH_NEEDS_GCC_AT_LEAST_X guards has been introduced by [1] to
prevent selecting an external toolchain that did not support the GCC
arch tuning the user had selected.

But it was not changed while updating to version 13.2-rel1.

Fixes: 7b4b3c2

[1] eed1670

Cc: Antoine Coutant <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
…R2_ARCH_NEEDS_GCC_AT_LEAST_X guard

BR2_ARCH_NEEDS_GCC_AT_LEAST_X guards has been introduced by [1] to
prevent selecting an external toolchain that did not support the GCC
arch tuning the user had selected.

But it was not changed while updating to version 13.2-rel1.

Fixes: 50ae5ea

[1] eed1670

Cc: Antoine Coutant <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
….rel1

Tested with qemu_arm_vexpress_defconfig.

Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
…14.2.rel1

Tested with qemu_aarch64_virt_defconfig.

Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
…to 14.2.rel1

Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
This commit introduces a new cross-ldd package which installs the
cross ldd implementation that comes from Crosstool-NG, and which can
be used like ldd, but when cross-compiling. We intend to use it as a
replacement of host-prelink-cross for our dracut package.

The cross-ldd from Crosstool-NG is in fact even recommended by the
Dracut documentation, in its docs/README.cross document:

   To support cross-compiled binaries, a different ldd variant is needed that
   works on those binaries. One such ldd script is found at
   https://gist.github.com/jerome-pouiller/c403786c1394f53f44a3b61214489e6f

This Github Gist in fact contains the xldd.in code from Crosstool-NG.

Our package downloads the full tarball of Crosstool-NG. We tried to
download only the script and the license file, but we couldn't figure
out a way of downloading them *and* have the version in the filename
to make sure that when doing an upgrade to a newer version, we
wouldn't have a clash between old/new files having the same name (and
causing conflicts with the hash verification). So in the end, we opted
for download the whole tarball.

Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
This commit reworks the dracut package to use the cross-ldd installed
by host-cross-ldd instead of prelink-rtld installed by
host-prelink-cross.

Indeed, prelink-cross is not maintained upstream, and its dependency
on host-libiberty causes problems in Buildroot with other packages.

The only change needed is that the dracut_wrapper script needs to be
generated, as we now need to know the prefix of the cross-compilation
tool (TARGET_CROSS).

Tested by running the dracut tests of the test suite.

Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
We are now using cross-ldd instead of prelink-cross, so we can drop
this package.

Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
host-libiberty was only used by host-prelink-cross, which has now been
removed.

The dependency of host-gdb on host-libiberty was not because it was
needed, but because if both host-libiberty and host-gdb were built,
host-gdb should be built after host-liberty. See commit
f0a583d ("package/gdb: depend on
libiberty")

Fixes:

  http://autobuild.buildroot.net/results/82d2d7d30c8e00bf6e9918c3d989f65a7330d381/ (host-binutils)
  http://autobuild.buildroot.net/results/a4674122a683e4842c1fd913da80a3e6e484d5a5/ (host-binutils-bare-metal)

Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
@pull pull bot added the ⤵️ pull label Jan 15, 2025
@pull pull bot merged commit 9347328 into ThomasDevoogdt:master Jan 15, 2025
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.

7 participants