Skip to content

chore: remove dosfstools and mtools from container#10602

Merged
nmattia merged 2 commits into
masterfrom
nm-no-dosfstools-mtool
Jun 30, 2026
Merged

chore: remove dosfstools and mtools from container#10602
nmattia merged 2 commits into
masterfrom
nm-no-dosfstools-mtool

Conversation

@nmattia

@nmattia nmattia commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

This moves the dostfstools and mtools binaries (suites) out of the container-installed packages and changes all build files & scripts to use the Bazel-provided versions instead.

This moves the `dostfstools` and `mtools` binaries (suites) out of the
container-installed packages and changes all build files & scripts to
use the Bazel-provided versions instead.
@nmattia nmattia force-pushed the nm-no-dosfstools-mtool branch from b6aa589 to 48067fa Compare June 29, 2026 13:06
@nmattia nmattia marked this pull request as ready for review June 29, 2026 13:27
@nmattia nmattia requested review from a team as code owners June 29, 2026 13:27
@zeropath-ai

zeropath-ai Bot commented Jun 29, 2026

Copy link
Copy Markdown

No security or compliance issues detected. Reviewed everything up to f174322.

Security Overview
Detected Code Changes
Change Type Relevant files
Enhancement ► ic-os/dev-tools/bare_metal_deployment/deploy.py
    Add mcopy tool path handling and integrate MCOPY usage in image injection flow
► ic-os/dev-tools/bare_metal_deployment/deploy.py
    Pass mcopy_path to inject_config_into_image
► ic-os/dev-tools/bare_metal_deployment/tools.bzl
    Expose --mcopy_tool flag and wire in mcopy path handling
► ic-os/dev-tools/build-setupos-config-image.sh
    Use MCOPY environment variable for image config steps
► rs/ic_os/config/tool/BUILD.bazel
    Set MCOPY environment variable for tests and pass through mcopy tool path
► rs/ic_os/os_tools/guest_vm_runner/BUILD.bazel
    Provide MCOPY to tests via env and data dependencies
► rs/tests/driver/assets/create-universal-vm-config-image.sh
    Use MKFS_FAT and MCOPY variables for image creation
► rs/tests/driver/src/driver/bootstrap.rs
    Document that MKFS_FAT/MCOPY/MLABEL are provided by system test rules
► rs/tests/driver/src/driver/universal_vm.rs
    Document in-container path handling for tool env vars
► rs/tests/run_systest.sh
    Add logic to rewrite MKFS_FAT/MCOPY tool paths for container runtime
► rs/tests/system_tests.bzl
    Add runtime deps MKFS_FAT/MCOPY/MLABEL mappings for Bazel tests
► third_party/BUILD.mtools.bazel
    Add mlabel to mtools tool suite and expose as public filegroup
Bug Fix
Refactor
Configuration changes

@basvandijk basvandijk left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! You got it working!

@nmattia nmattia enabled auto-merge June 30, 2026 13:32
@nmattia nmattia added this pull request to the merge queue Jun 30, 2026
Merged via the queue into master with commit 2bb2a43 Jun 30, 2026
37 checks passed
@nmattia nmattia deleted the nm-no-dosfstools-mtool branch June 30, 2026 14:32
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.

5 participants