refactor: Remove inject_files rule invocations and move injection of binaries to ext4_image #3497
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
Bownairo
reviewed
Jan 18, 2025
| # Note that we defer injecting the files from images_deps["rootfs"]. These are mostly slower to build. | ||
|
|
||
| # NOTE: e2fsdroid does not support filenames with spaces, fortunately, | ||
| # there are only two in our build. |
There was a problem hiding this comment.
Hm, I guess we forgot to update this last time. Maybe better would be to say:
... fortunately, these only occur in firmware that we do not use
| @@ -139,80 +139,86 @@ def icos_build( | |||
|
|
|||
| # -------------------- Extract root partition -------------------- | |||
|
|
|||
| # Note that we defer injecting the files from images_deps["rootfs"]. These are mostly slower to build. | |||
There was a problem hiding this comment.
This is no longer true, right?
Comment on lines
+221
to
+222
| "-d", | ||
| os.path.join(fs_basedir, limit_prefix), |
There was a problem hiding this comment.
Same as #3476 (comment), we should make sure to investigate just in case.
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.
Removing this step from our build simplifies the build process and allows for further optimizations.
Runtimes of building the image when rootfs-tree.tar and rootfs contents are available from cache:
HostOS:
GuestOS:
Diff: