-
Notifications
You must be signed in to change notification settings - Fork 8
[WIP] feat(rootfs, config): enable disk generation in docker and build multiple platform the same time #106
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
Open
Samuka007
wants to merge
11
commits into
main
Choose a base branch
from
007/docker-multiarch
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #106 +/- ##
==========================================
- Coverage 51.80% 48.23% -3.58%
==========================================
Files 51 51
Lines 4953 5357 +404
==========================================
+ Hits 2566 2584 +18
- Misses 2387 2773 +386
🚀 New features to boost your workflow:
|
3118f3e
to
ab20161
Compare
代码目前有很多地方是复制代码的,需要优化 |
be4e8fb
to
118df96
Compare
refactor(rootfs): better resource management
v1正常跑 用cargo clippy --fix修了一下 Merge remote-tracking branch 'upstream/main' into fk_merge
77ad885
to
fe8ff7b
Compare
…v1 back to original implmentation
Samuka007
commented
Apr 26, 2025
dadk/src/actions/rootfs/disk_img.rs
Outdated
Comment on lines
12
to
25
pub static BUILDER_VERSION: OnceLock<BuilderVersion> = OnceLock::new(); | ||
|
||
pub fn set_builder_version(ctx: &DADKExecContext) { | ||
let version = BuilderVersion::from_str(ctx.manifest().metadata.builder_version.as_str()); | ||
BUILDER_VERSION | ||
.set(version) | ||
.expect("Failed to set builder version"); | ||
log::info!("Current builder version: {:?}", get_builder_version()); | ||
} | ||
pub fn get_builder_version() -> BuilderVersion { | ||
log::info!("Current builder version: {:?}", BUILDER_VERSION.get()); | ||
|
||
BUILDER_VERSION.get().cloned().unwrap_or(BuilderVersion::V1) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
目前引入了一个全局变量标志位来减小代码耦合度,但限制了每次执行dadk只能走其中一个pattern
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.
Enable disk generation in docker and build multiple platform the same time. Nolonger need to wait for long rebuild time when switching back to the different platform.
Currently, due to the limitation of grub, x86_64 still couldn't do all-in-one building in docker (but riscv64 could). But, building with latest dadk in bare metal machine is ok.
Now this build of DADK can:
Also, it is verified ok (but not recommanded) to build the schedule modified and unmodified branch (by simply
git checkout
between branches, like most of the people do) in the same directory without explicitly cleanup the old outputs under thebin
directory.