WORKSPACE: migrate simple http_archive, http_file and git_repositories to bzlmod
All the others will follow but are more invasive changes.
Change-Id: I12b6983015be89e179d7e61ae25bf98a48b2c468
Reviewed-on: https://review.monogon.dev/c/monogon/+/3282
Reviewed-by: Leopold Schabel <leo@monogon.tech>
Tested-by: Jenkins CI
diff --git a/MODULE.bazel b/MODULE.bazel
index e68816e..450ffa4 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -100,3 +100,5 @@
include("//:go.MODULE.bazel")
include("//:oci.MODULE.bazel")
+
+include("//:third_party.MODULE.bazel")
diff --git a/WORKSPACE b/WORKSPACE
index 4e0e2f6..a209b58 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,7 +1,5 @@
workspace(name = "dev_source_monogon")
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
-
# Assert minimum Bazel version
load("@bazel_skylib//lib:versions.bzl", "versions")
@@ -68,14 +66,6 @@
version = "2.0",
)
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-git_repository(
- name = "gperf",
- commit = "de9373c2d48a3edf29862eb8be44764a7f7d24c6",
- remote = "https://github.com/monogon-dev/gperf.git",
- shallow_since = "1615306886 +0100",
-)
load("//third_party/seccomp:external.bzl", "seccomp_external")
@@ -134,41 +124,6 @@
version = "15-4.2.3",
)
-# Derived from Mozilla NSS, currently needed for containerd to be able to pull images
-http_file(
- name = "cacerts",
- sha256 = "1bf458412568e134a4514f5e170a328d11091e071c7110955c9884ed87972ac9",
- urls = ["https://curl.se/ca/cacert-2024-07-02.pem"],
-)
-
-# lz4, the library and the tool.
-http_archive(
- name = "com_github_lz4_lz4",
- patch_args = ["-p1"],
- patches = ["//third_party/lz4:build.patch"],
- sha256 = "658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc",
- strip_prefix = "lz4-1.9.2",
- urls = ["https://github.com/lz4/lz4/archive/v1.9.2.tar.gz"],
-)
-
-# ini.h, a tiny ini parser library
-http_archive(
- name = "inih",
- build_file = "@//third_party/inih:inih.bzl",
- sha256 = "01b0366fdfdf6363efc070c2f856f1afa33e7a6546548bada5456ad94a516241",
- strip_prefix = "inih-r53",
- urls = ["https://github.com/benhoyt/inih/archive/r53.tar.gz"],
-)
-
-# qboot bootloader for MicroVMs
-http_archive(
- name = "com_github_bonzini_qboot",
- build_file = "//third_party/qboot:qboot.bzl",
- sha256 = "a643b2486fbee57b969659d408984094ca9afa1a048317dd3f5d3022e47213e8",
- strip_prefix = "qboot-a5300c4949b8d4de2d34bedfaed66793f48ec948",
- urls = ["https://github.com/bonzini/qboot/archive/a5300c4949b8d4de2d34bedfaed66793f48ec948.tar.gz"],
-)
-
load("//third_party/dosfstools:external.bzl", "dosfstools_external")
dosfstools_external(
@@ -181,35 +136,6 @@
musl_sysroot_repositories()
-# CockroachDB binary used for tests.
-#
-# WARNING: Not distributed under an OSI certified license. Must only be used in
-# tests, not be redistributed!
-http_archive(
- name = "cockroach",
- build_file_content = """
-exports_files([
- "cockroach"
-])
-""",
- sha256 = "0821cff5770400fb94c8b6c2ab338d96f4114fbf2b3206bc8a6dcf62f9c0f4ea",
- strip_prefix = "cockroach-v22.1.6.linux-amd64",
- urls = [
- # TODO: select() to pick other host architectures.
- "https://binaries.cockroachdb.com/cockroach-v22.1.6.linux-amd64.tgz",
- ],
-)
-
-# CockroachDB repository used for linter passes.
-http_archive(
- name = "com_github_cockroachdb_cockroach",
- integrity = "sha256-3xYgvXmuPvrGgtSzfoK/K9p/FCH0eMZywAAL10A41k0=",
- strip_prefix = "cockroach-23.2.4",
- urls = [
- "https://github.com/cockroachdb/cockroach/archive/v23.2.4.tar.gz",
- ],
-)
-
# bazeldnf is used to generate our sandbox root.
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -229,31 +155,6 @@
sandbox_dependencies()
-# Used by tests in cloud/takeover
-http_file(
- name = "debian_11_cloudimage",
- sha256 = "14caeec68ba3129a115a9b57396d08dc0973cc9f569ce049232d7d15d768ad41",
- urls = [
- "https://cloud.debian.org/images/cloud/bullseye/20230124-1270/debian-11-genericcloud-amd64-20230124-1270.qcow2",
- ],
-)
-
-# Used to include staticcheck as nogo analyzer
-http_archive(
- name = "com_github_sluongng_nogo_analyzer",
- integrity = "sha256-p0peRHUdKS0XvYeeWqi0C6qUtdwvBD3x46y7PiPq0HM=",
- strip_prefix = "nogo-analyzer-0.0.2",
- urls = [
- "https://github.com/sluongng/nogo-analyzer/archive/refs/tags/v0.0.2.tar.gz",
- ],
-)
-
-git_repository(
- name = "boringssl",
- commit = "d7278cebad5b8eda0901246f2215344cffece4f4",
- remote = "https://boringssl.googlesource.com/boringssl",
-)
-
load("//third_party/libtpms:external.bzl", "libtpms_external")
libtpms_external(
diff --git a/third_party.MODULE.bazel b/third_party.MODULE.bazel
new file mode 100644
index 0000000..66c73c8
--- /dev/null
+++ b/third_party.MODULE.bazel
@@ -0,0 +1,102 @@
+# third_party external repositories
+
+git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+
+# Used by tests in cloud/takeover
+http_file(
+ name = "debian_11_cloudimage",
+ sha256 = "14caeec68ba3129a115a9b57396d08dc0973cc9f569ce049232d7d15d768ad41",
+ urls = [
+ "https://cloud.debian.org/images/cloud/bullseye/20230124-1270/debian-11-genericcloud-amd64-20230124-1270.qcow2",
+ ],
+)
+
+# Used to include staticcheck as nogo analyzer
+http_archive(
+ name = "com_github_sluongng_nogo_analyzer",
+ integrity = "sha256-p0peRHUdKS0XvYeeWqi0C6qUtdwvBD3x46y7PiPq0HM=",
+ strip_prefix = "nogo-analyzer-0.0.2",
+ urls = [
+ "https://github.com/sluongng/nogo-analyzer/archive/refs/tags/v0.0.2.tar.gz",
+ ],
+)
+
+git_repository(
+ name = "boringssl",
+ commit = "d7278cebad5b8eda0901246f2215344cffece4f4",
+ remote = "https://boringssl.googlesource.com/boringssl",
+)
+
+# CockroachDB binary used for tests.
+#
+# WARNING: Not distributed under an OSI certified license. Must only be used in
+# tests, not be redistributed!
+http_archive(
+ name = "cockroach",
+ build_file_content = """
+exports_files([
+ "cockroach"
+])
+""",
+ sha256 = "0821cff5770400fb94c8b6c2ab338d96f4114fbf2b3206bc8a6dcf62f9c0f4ea",
+ strip_prefix = "cockroach-v22.1.6.linux-amd64",
+ urls = [
+ # TODO: select() to pick other host architectures.
+ "https://binaries.cockroachdb.com/cockroach-v22.1.6.linux-amd64.tgz",
+ ],
+)
+
+# CockroachDB repository used for linter passes.
+http_archive(
+ name = "com_github_cockroachdb_cockroach",
+ integrity = "sha256-3xYgvXmuPvrGgtSzfoK/K9p/FCH0eMZywAAL10A41k0=",
+ strip_prefix = "cockroach-23.2.4",
+ urls = [
+ "https://github.com/cockroachdb/cockroach/archive/v23.2.4.tar.gz",
+ ],
+)
+
+
+# Derived from Mozilla NSS, currently needed for containerd to be able to pull images
+http_file(
+ name = "cacerts",
+ sha256 = "1bf458412568e134a4514f5e170a328d11091e071c7110955c9884ed87972ac9",
+ urls = ["https://curl.se/ca/cacert-2024-07-02.pem"],
+)
+
+# lz4, the library and the tool.
+http_archive(
+ name = "com_github_lz4_lz4",
+ patch_args = ["-p1"],
+ patches = ["//third_party/lz4:build.patch"],
+ sha256 = "658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc",
+ strip_prefix = "lz4-1.9.2",
+ urls = ["https://github.com/lz4/lz4/archive/v1.9.2.tar.gz"],
+)
+
+# ini.h, a tiny ini parser library
+http_archive(
+ name = "inih",
+ build_file = "@//third_party/inih:inih.bzl",
+ sha256 = "01b0366fdfdf6363efc070c2f856f1afa33e7a6546548bada5456ad94a516241",
+ strip_prefix = "inih-r53",
+ urls = ["https://github.com/benhoyt/inih/archive/r53.tar.gz"],
+)
+
+# qboot bootloader for MicroVMs
+http_archive(
+ name = "com_github_bonzini_qboot",
+ build_file = "//third_party/qboot:qboot.bzl",
+ sha256 = "a643b2486fbee57b969659d408984094ca9afa1a048317dd3f5d3022e47213e8",
+ strip_prefix = "qboot-a5300c4949b8d4de2d34bedfaed66793f48ec948",
+ urls = ["https://github.com/bonzini/qboot/archive/a5300c4949b8d4de2d34bedfaed66793f48ec948.tar.gz"],
+)
+
+git_repository(
+ name = "gperf",
+ commit = "de9373c2d48a3edf29862eb8be44764a7f7d24c6",
+ remote = "https://github.com/monogon-dev/gperf.git",
+ shallow_since = "1615306886 +0100",
+)