[pull] master from buildroot:master #328
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Exporting the download variables can cause unfortunate name clashes, as
occurred with the SCP variable used by Binman for compiling U-Boot [1].
Do not globally export the package download commands anymore; instead,
pass them to the dl-wrapper environment.
The issue can be reproduced by building the rock5b_defconfig.
In that case, compilation fails with output:
usage: binman [-h] [-B BUILD_DIR] [-D] [-H] [--tooldir TOOLDIR]
[--toolpath TOOLPATH] [-T THREADS] [--test-section-timeout]
[-v VERBOSITY] [-V]
{build,bintool-docs,entry-docs,ls,extract,replace,sign,test,tool}
...
binman: error: unrecognized arguments: -o ConnectTimeout=10
This build failure is due to the naming clash on the "SCP" environment
variable. The "SCP" initially exported in package/pkg-download.mk
refers to the SSH Secure File Copy command. While the "SCP" variable
in U-Boot refers to the "System Control Processor firmware blob",
which is a binary file used by u-boot to build a boot image.
Even if the name clash has always been present, the build issues were
occuring since commit [2].
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/9122556697
(and many others)
[1] https://lore.kernel.org/buildroot/a023971c7c8bfa4826a9a8721500c7ff@free.fr/T/
[2] https://gitlab.com/buildroot.org/buildroot/-/commit/4bce3270d68074d397b1ac9726f5c970eb517fcb
Cc: Julien Olivain <ju.o@free.fr>
Suggested-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
[Julien:
- reorder variables alphabetically
- add LOCALFILES variable
- add info in commit log (build failure log, example to reproduce,
details about the name clash)
]
Signed-off-by: Julien Olivain <ju.o@free.fr>
As of release 3.49.0, the author has replaced the configure script used in the precompiled amalgamation tarball with Autosetup instead of Autotools. Buildroot commit [1] bumped sqlite to 3.49.0 without changing the package infra. This introduced build issues. The "autotools-package" and "host-autotools-package" lines are no longer available, so those have to be replaced by the "generic-package" and "host-generic-package" lines in the .mk file. The Autosetup configuration script does not support the "enable-dynamic-extensions" and "disable-static-shell" options, so the relevant lines in the .mk file are removed. The Autosetup configuration script can automatically detect whether threads are supported and set the relevant SQLITE_THREADSAFE flag, so the relevant lines in the .mk file are removed. Fixes: https://autobuild.buildroot.org/?reason=sqlite-3.49.0 [1] https://gitlab.com/buildroot.org/buildroot/-/commit/db85638cea3414ca0293cbbb2352e5b0b63a2579 Signed-off-by: Scott Fan <fancp2007@gmail.com> Tested-by: Fiona Klute (WIWA) <fiona.klute@gmx.de> [Julien: add link to commit which introduced the build issue] Signed-off-by: Julien Olivain <ju.o@free.fr>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 : )