-
Notifications
You must be signed in to change notification settings - Fork 12
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
Aarch64 gns3 appliance and improved branding support #164
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
Contributor
troglobit
commented
Oct 11, 2023
- Very basic GNS3 support for Aarch64 NETCONF builds (no U-boot support, boots Linux Image)
- Greatly improved branding support, using menuconfig, for /etc/os-release and /etc/version
- Generate artifact names and content from branding
- Minor, fix aarch64 classic build
Calling `load_cfg BR2_EXTERNAL_INFIX_PATH` from post-image.sh caused warnings due to multiple hits in the .config file: post-image.sh: 12: /tmp/tmp.5a3xhQQVc8: BR2_EXTERNAL_INFIX_PATH: not found post-image.sh: 13: /tmp/tmp.5a3xhQQVc8: BR2_EXTERNAL_INFIX_PATH: not found Let's grep for a "key.*=" instead of "key" to drop those warnings, while still acting as a catch-all for partial matches. Signed-off-by: Joachim Wiberg <[email protected]>
Due to problems with using u-boot as loader¹ we decided to start the system by calling the kernel image directly. The downside to that is that, even though RAUC upgrades would work, the kernel would remain the same. Improvements to this are of course welcome. ________ ¹) Must extract the built-in .dtb and merge with the Qemu .dtb at runtime to be able to boot primary (or secondry) image. Signed-off-by: Joachim Wiberg <[email protected]>
Signed-off-by: Joachim Wiberg <[email protected]>
The default arch and disk image filename needs to be generated to be unique per, at least, each architecture build. Signed-off-by: Joachim Wiberg <[email protected]>
This makes it possible for projects using Infix as a br2-external to override lots of OS-specific strings and contact information that previously was hard coded. The generated /etc/os-release now takes most of its data from .config Worth noting is the changes in VERSION and BUILD_ID fields. The former will be INFIX_RELEASE, during release builds, and the latter is always the output from `git descibe ...`, or rather GIT_VERSION. This variable can be overloaded as well. See the help text and the new doc/branding.md document for details. Signed-off-by: Joachim Wiberg <[email protected]>
- Create per-arch unique distribution file names - Source .gns3a information from /etc/os-release Instead of attempting to create unique file names by hard-coding an 'infix-' prefix and extracting the "board" or "arch" part from the defconfig, let's use the branding information from /etc/os-release along with $BR2_ARCH. Signed-off-by: Joachim Wiberg <[email protected]>
Signed-off-by: Joachim Wiberg <[email protected]>
Signed-off-by: Joachim Wiberg <[email protected]>
wkz
approved these changes
Oct 12, 2023
As @wkz says, better to use this construct if/when we add more archs. [skip ci] Co-authored-by: Tobias Waldekranz <[email protected]>
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.