Skip to content

Move dosfstools and mtools external repo configuration into base/cvd/build_external #1974

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.

Sign up for GitHub

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

Merged
Databean merged 2 commits into from
Jan 14, 2026
+30 −26
Merged

Move dosfstools and mtools external repo configuration into base/cvd/build_external #1974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa12f83
Move dosfstools external repo configuration into build_external/dosfs…
Databean Jan 7, 2026
7a271f5
Move `mtools` external repo configuration to build_external/mtools
Databean Jan 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 2 additions & 26 deletions base/cvd/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ bazel_dep(name = "toolchains_llvm", version = "1.4.0")
bazel_dep(name = "sandboxed_api")
bazel_dep(name = "zlib", version = "1.3.1.bcr.7")

include("//build_external:build_external.MODULE.bazel")

# this needs to be at parity with with build_external/crosvm/crosvm.config.toml
CROSVM_REMOTE = "https://chromium.googlesource.com/crosvm/crosvm"
CROSVM_REV = "bc84c8bd6ce078e251594aa1af9e84932c5d0d81"
Expand Down Expand Up @@ -410,21 +412,6 @@ casimir_crates.from_cargo(
)
use_repo(casimir_crates, "casimir_crates")

http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# Upstream mtools is in subversion, which bazel doesn't support
http_archive(
name = "mtools",
build_file = "@//:BUILD.mtools.bazel",
urls = [
"https://mirrors.ibiblio.org/gnu/mtools/mtools-4.0.48.tar.bz2",
"https://ftp.halifax.rwth-aachen.de/gnu/mtools/mtools-4.0.48.tar.bz2",
"http://ftp.gnu.org/gnu/mtools/mtools-4.0.48.tar.bz2",
],
sha256 = "03c29aac8735dd7154a989fbc29eaf2b506121ae1c3a35cd0bf2a02e94d271a9",
strip_prefix = "mtools-4.0.48",
)

git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
git_repository(
name = "fruit",
Expand Down Expand Up @@ -712,17 +699,6 @@ git_repository(
remote = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools",
)

git_repository(
name = "dosfstools",
build_file = "@//:BUILD.dosfstools.bazel",
commit = "289a48b9cb5b3c589391d28aa2515c325c932c7a",
remote = "https://github.com/dosfstools/dosfstools",
patch_strip = 1,
patches = [
"@//build_external/dosfstools:PATCH.vasprintf.patch",
],
)

git_repository(
name = "android_system_core",
build_file = "@//:BUILD.android_system_core.bazel",
Expand Down
2 changes: 2 additions & 0 deletions base/cvd/build_external/build_external.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include("//build_external/dosfstools:dosfstools.MODULE.bazel")
include("//build_external/mtools:mtools.MODULE.bazel")
0 base/cvd/BUILD.dosfstools.bazel → ...xternal/dosfstools/BUILD.dosfstools.bazel
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions base/cvd/build_external/dosfstools/dosfstools.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

git_repository(
name = "dosfstools",
build_file = "@//build_external/dosfstools:BUILD.dosfstools.bazel",
commit = "289a48b9cb5b3c589391d28aa2515c325c932c7a",
remote = "https://github.com/dosfstools/dosfstools",
patch_strip = 1,
patches = [
"@//build_external/dosfstools:PATCH.vasprintf.patch",
],
)
0 base/cvd/BUILD.mtools.bazel → .../build_external/mtools/BUILD.mtools.bazel
View file
Open in desktop
File renamed without changes.
14 changes: 14 additions & 0 deletions base/cvd/build_external/mtools/mtools.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# Upstream mtools is in subversion, which bazel doesn't support
http_archive(
name = "mtools",
build_file = "//build_external/mtools:BUILD.mtools.bazel",
urls = [
"https://mirrors.ibiblio.org/gnu/mtools/mtools-4.0.48.tar.bz2",
"https://ftp.halifax.rwth-aachen.de/gnu/mtools/mtools-4.0.48.tar.bz2",
"http://ftp.gnu.org/gnu/mtools/mtools-4.0.48.tar.bz2",
],
sha256 = "03c29aac8735dd7154a989fbc29eaf2b506121ae1c3a35cd0bf2a02e94d271a9",
strip_prefix = "mtools-4.0.48",
)
Loading