treewide: move build helper to more fitting places
Change-Id: I3d0cfe9283222d403ae369ec9db09201ad511e15
Reviewed-on: https://review.monogon.dev/c/monogon/+/3327
Reviewed-by: Serge Bazanski <serge@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/build/gotoolwrap/BUILD.bazel b/build/gotoolwrap/BUILD.bazel
similarity index 81%
rename from metropolis/build/gotoolwrap/BUILD.bazel
rename to build/gotoolwrap/BUILD.bazel
index 281f4b3..bb02dc1 100644
--- a/metropolis/build/gotoolwrap/BUILD.bazel
+++ b/build/gotoolwrap/BUILD.bazel
@@ -3,7 +3,7 @@
go_library(
name = "gotoolwrap_lib",
srcs = ["main.go"],
- importpath = "source.monogon.dev/metropolis/build/gotoolwrap",
+ importpath = "source.monogon.dev/build/gotoolwrap",
visibility = ["//visibility:private"],
)
diff --git a/metropolis/build/gotoolwrap/main.go b/build/gotoolwrap/main.go
similarity index 100%
rename from metropolis/build/gotoolwrap/main.go
rename to build/gotoolwrap/main.go
diff --git a/build/static_binary_tarball/def.bzl b/build/static_binary_tarball/def.bzl
index 9826f31..b23f4e0 100644
--- a/build/static_binary_tarball/def.bzl
+++ b/build/static_binary_tarball/def.bzl
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-load("//metropolis/node/build:def.bzl", "build_static_transition")
+load("//osbase/build:def.bzl", "build_static_transition")
def _static_binary_tarball_impl(ctx):
layer_spec = ctx.actions.declare_file(ctx.label.name + ".prototxt")
diff --git a/cloud/agent/BUILD.bazel b/cloud/agent/BUILD.bazel
index 8f96663..dd54619 100644
--- a/cloud/agent/BUILD.bazel
+++ b/cloud/agent/BUILD.bazel
@@ -16,12 +16,12 @@
deps = [
"//cloud/agent/api",
"//cloud/bmaas/server/api",
- "//metropolis/node/build/mkimage/osimage",
"//metropolis/node/core/devmgr",
"//metropolis/node/core/network",
"//net/proto",
"//osbase/blockdev",
"//osbase/bootparam",
+ "//osbase/build/mkimage/osimage",
"//osbase/efivarfs",
"//osbase/logtree",
"//osbase/nvme",
diff --git a/cloud/agent/install.go b/cloud/agent/install.go
index 66cd236..2eaeeb3 100644
--- a/cloud/agent/install.go
+++ b/cloud/agent/install.go
@@ -14,9 +14,9 @@
"google.golang.org/protobuf/proto"
bpb "source.monogon.dev/cloud/bmaas/server/api"
- "source.monogon.dev/metropolis/node/build/mkimage/osimage"
npb "source.monogon.dev/net/proto"
"source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/efivarfs"
"source.monogon.dev/osbase/logtree"
)
diff --git a/cloud/agent/takeover/BUILD.bazel b/cloud/agent/takeover/BUILD.bazel
index 49e12ac..8594e4c 100644
--- a/cloud/agent/takeover/BUILD.bazel
+++ b/cloud/agent/takeover/BUILD.bazel
@@ -1,8 +1,8 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("//metropolis/node/build/mkucode:def.bzl", "cpio_ucode")
+load("//osbase/build/mkucode:def.bzl", "cpio_ucode")
load("//build/static_binary_tarball:def.bzl", "static_binary_tarball")
-load("//metropolis/node/build:def.bzl", "node_initramfs")
-load("//metropolis/node/build/fwprune:def.bzl", "fsspec_linux_firmware")
+load("//osbase/build:def.bzl", "node_initramfs")
+load("//osbase/build/fwprune:def.bzl", "fsspec_linux_firmware")
go_library(
name = "takeover_lib",
@@ -36,7 +36,7 @@
"@cacerts//file": "/etc/ssl/cert.pem",
},
fsspecs = [
- "//metropolis/node/build:earlydev.fsspec",
+ "//osbase/build:earlydev.fsspec",
"//third_party:firmware",
],
visibility = ["//cloud/agent:__subpackages__"],
diff --git a/metropolis/build/kube-code-generator/boilerplate.go.txt b/metropolis/build/kube-code-generator/boilerplate.go.txt
index ef05f6f..c097ae1 100644
--- a/metropolis/build/kube-code-generator/boilerplate.go.txt
+++ b/metropolis/build/kube-code-generator/boilerplate.go.txt
@@ -1 +1 @@
-// Code generated by //metropolis/build/kubernetes-code-generator. Do not commit to source control.
+// Code generated by //osbase/build/kubernetes-code-generator. Do not commit to source control.
diff --git a/metropolis/build/kube-code-generator/defs.bzl b/metropolis/build/kube-code-generator/defs.bzl
index 7d431ef..2bc32bf 100644
--- a/metropolis/build/kube-code-generator/defs.bzl
+++ b/metropolis/build/kube-code-generator/defs.bzl
@@ -168,7 +168,7 @@
)
# _gotool_run is a helper function which runs an executable under
-# //metropolis/build/gotoolwrap, effectively setting up everything required to
+# //osbase/build/gotoolwrap, effectively setting up everything required to
# use standard Go tooling on the monogon workspace (ie. GOPATH/GOROOT). This is
# required by generators to run 'go fmt'.
#
@@ -524,7 +524,7 @@
default = "@io_bazel_rules_go//:go_context_data",
),
"_gotoolwrap": attr.label(
- default = Label("//metropolis/build/gotoolwrap"),
+ default = Label("//build/gotoolwrap"),
allow_single_file = True,
executable = True,
cfg = "exec",
diff --git a/metropolis/installer/BUILD.bazel b/metropolis/installer/BUILD.bazel
index a0d1993..29eac44 100644
--- a/metropolis/installer/BUILD.bazel
+++ b/metropolis/installer/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("//metropolis/node/build:def.bzl", "node_initramfs")
-load("//metropolis/node/build/genosrelease:defs.bzl", "os_release")
-load("//metropolis/node/build:efi.bzl", "efi_unified_kernel_image")
+load("//osbase/build:def.bzl", "node_initramfs")
+load("//osbase/build/genosrelease:defs.bzl", "os_release")
+load("//osbase/build:efi.bzl", "efi_unified_kernel_image")
go_library(
name = "installer_lib",
@@ -15,8 +15,8 @@
importpath = "source.monogon.dev/metropolis/installer",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/node/build/mkimage/osimage",
"//osbase/blockdev",
+ "//osbase/build/mkimage/osimage",
"//osbase/efivarfs",
"//osbase/sysfs",
"@org_golang_x_sys//unix",
@@ -35,7 +35,7 @@
"//metropolis/installer": "/init",
},
fsspecs = [
- "//metropolis/node/build:earlydev.fsspec",
+ "//osbase/build:earlydev.fsspec",
],
visibility = ["//metropolis/installer/test:__pkg__"],
)
diff --git a/metropolis/installer/main.go b/metropolis/installer/main.go
index bc428a0..e2d0d55 100644
--- a/metropolis/installer/main.go
+++ b/metropolis/installer/main.go
@@ -34,8 +34,8 @@
"golang.org/x/sys/unix"
- "source.monogon.dev/metropolis/node/build/mkimage/osimage"
"source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/efivarfs"
"source.monogon.dev/osbase/sysfs"
)
diff --git a/metropolis/installer/test/BUILD.bazel b/metropolis/installer/test/BUILD.bazel
index 3f74cde..9971209 100644
--- a/metropolis/installer/test/BUILD.bazel
+++ b/metropolis/installer/test/BUILD.bazel
@@ -1,5 +1,5 @@
load("@io_bazel_rules_go//go:def.bzl", "go_test")
-load("//metropolis/node/build:efi.bzl", "efi_unified_kernel_image")
+load("//osbase/build:efi.bzl", "efi_unified_kernel_image")
go_test(
name = "test_test",
@@ -23,8 +23,8 @@
},
deps = [
"//metropolis/cli/metroctl/core",
- "//metropolis/node/build/mkimage/osimage",
"//metropolis/proto/api",
+ "//osbase/build/mkimage/osimage",
"//osbase/cmd",
"@com_github_diskfs_go_diskfs//:go-diskfs",
"@com_github_diskfs_go_diskfs//disk",
diff --git a/metropolis/installer/test/run_test.go b/metropolis/installer/test/run_test.go
index fef8e20..64fa210 100644
--- a/metropolis/installer/test/run_test.go
+++ b/metropolis/installer/test/run_test.go
@@ -38,7 +38,7 @@
"source.monogon.dev/metropolis/proto/api"
mctl "source.monogon.dev/metropolis/cli/metroctl/core"
- "source.monogon.dev/metropolis/node/build/mkimage/osimage"
+ "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/cmd"
)
diff --git a/metropolis/installer/test/testos/BUILD.bazel b/metropolis/installer/test/testos/BUILD.bazel
index 8d5f267..d1ae0df 100644
--- a/metropolis/installer/test/testos/BUILD.bazel
+++ b/metropolis/installer/test/testos/BUILD.bazel
@@ -1,6 +1,6 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("//metropolis/node/build:def.bzl", "erofs_image", "verity_image")
-load("//metropolis/node/build:efi.bzl", "efi_unified_kernel_image")
+load("//osbase/build:def.bzl", "erofs_image", "verity_image")
+load("//osbase/build:efi.bzl", "efi_unified_kernel_image")
load("@rules_pkg//:pkg.bzl", "pkg_zip")
erofs_image(
diff --git a/metropolis/node/BUILD.bazel b/metropolis/node/BUILD.bazel
index 6354edc..a0847f8 100644
--- a/metropolis/node/BUILD.bazel
+++ b/metropolis/node/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-load("//metropolis/node/build:def.bzl", "erofs_image", "verity_image")
-load("//metropolis/node/build:efi.bzl", "efi_unified_kernel_image")
-load("//metropolis/node/build/mkimage:def.bzl", "node_image")
+load("//osbase/build:def.bzl", "erofs_image", "verity_image")
+load("//osbase/build:efi.bzl", "efi_unified_kernel_image")
+load("//osbase/build/mkimage:def.bzl", "node_image")
load("@rules_pkg//:pkg.bzl", "pkg_zip")
go_library(
@@ -89,7 +89,7 @@
},
fsspecs = [
":erofs-layout.fsspec",
- "//metropolis/node/build:earlydev.fsspec",
+ "//osbase/build:earlydev.fsspec",
"//third_party:firmware",
],
symlinks = {
@@ -135,7 +135,7 @@
],
)
-load("//metropolis/node/build/genosrelease:defs.bzl", "os_release")
+load("//osbase/build/genosrelease:defs.bzl", "os_release")
os_release(
name = "os-release-info",
diff --git a/metropolis/node/core/abloader/BUILD.bazel b/metropolis/node/core/abloader/BUILD.bazel
index d56a391..e8c49ac 100644
--- a/metropolis/node/core/abloader/BUILD.bazel
+++ b/metropolis/node/core/abloader/BUILD.bazel
@@ -1,5 +1,5 @@
load("@rules_rust//rust:defs.bzl", "rust_binary")
-load("//metropolis/node/build:def.bzl", "platform_transition_binary")
+load("//osbase/build:def.bzl", "platform_transition_binary")
rust_binary(
name = "abloader_bin",
diff --git a/metropolis/node/core/update/BUILD.bazel b/metropolis/node/core/update/BUILD.bazel
index 30ca20b..f60ba40 100644
--- a/metropolis/node/core/update/BUILD.bazel
+++ b/metropolis/node/core/update/BUILD.bazel
@@ -9,9 +9,9 @@
importpath = "source.monogon.dev/metropolis/node/core/update",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node/build/mkimage/osimage",
"//metropolis/node/core/abloader/spec",
"//osbase/blockdev",
+ "//osbase/build/mkimage/osimage",
"//osbase/efivarfs",
"//osbase/gpt",
"//osbase/kexec",
diff --git a/metropolis/node/core/update/e2e/BUILD.bazel b/metropolis/node/core/update/e2e/BUILD.bazel
index abf3ba1..3443ecf 100644
--- a/metropolis/node/core/update/e2e/BUILD.bazel
+++ b/metropolis/node/core/update/e2e/BUILD.bazel
@@ -26,9 +26,9 @@
"xAbloaderPath": "_main/metropolis/node/core/abloader/abloader_bin.efi",
},
deps = [
- "//metropolis/node/build/mkimage/osimage",
"//osbase/blkio",
"//osbase/blockdev",
+ "//osbase/build/mkimage/osimage",
"@io_bazel_rules_go//go/runfiles:go_default_library",
],
)
diff --git a/metropolis/node/core/update/e2e/e2e_test.go b/metropolis/node/core/update/e2e/e2e_test.go
index 68e55e0..7679a69 100644
--- a/metropolis/node/core/update/e2e/e2e_test.go
+++ b/metropolis/node/core/update/e2e/e2e_test.go
@@ -18,9 +18,9 @@
"github.com/bazelbuild/rules_go/go/runfiles"
- "source.monogon.dev/metropolis/node/build/mkimage/osimage"
"source.monogon.dev/osbase/blkio"
"source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/build/mkimage/osimage"
)
var (
diff --git a/metropolis/node/core/update/e2e/testos/BUILD.bazel b/metropolis/node/core/update/e2e/testos/BUILD.bazel
index 275a44c..8a4b122 100644
--- a/metropolis/node/core/update/e2e/testos/BUILD.bazel
+++ b/metropolis/node/core/update/e2e/testos/BUILD.bazel
@@ -13,10 +13,10 @@
importpath = "source.monogon.dev/metropolis/node/core/update/e2e/testos",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/node/build/mkimage/osimage",
"//metropolis/node/core/network",
"//metropolis/node/core/update",
"//osbase/blockdev",
+ "//osbase/build/mkimage/osimage",
"//osbase/gpt",
"//osbase/logtree",
"//osbase/supervisor",
diff --git a/metropolis/node/core/update/e2e/testos/main.go b/metropolis/node/core/update/e2e/testos/main.go
index e77a4e2..69897eb 100644
--- a/metropolis/node/core/update/e2e/testos/main.go
+++ b/metropolis/node/core/update/e2e/testos/main.go
@@ -8,10 +8,10 @@
"golang.org/x/sys/unix"
- "source.monogon.dev/metropolis/node/build/mkimage/osimage"
"source.monogon.dev/metropolis/node/core/network"
"source.monogon.dev/metropolis/node/core/update"
"source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/gpt"
"source.monogon.dev/osbase/logtree"
"source.monogon.dev/osbase/supervisor"
diff --git a/metropolis/node/core/update/e2e/testos/testos.bzl b/metropolis/node/core/update/e2e/testos/testos.bzl
index 29e218f..2ce3e31 100644
--- a/metropolis/node/core/update/e2e/testos/testos.bzl
+++ b/metropolis/node/core/update/e2e/testos/testos.bzl
@@ -1,6 +1,6 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary")
-load("//metropolis/node/build:def.bzl", "erofs_image", "verity_image")
-load("//metropolis/node/build:efi.bzl", "efi_unified_kernel_image")
+load("//osbase/build:def.bzl", "erofs_image", "verity_image")
+load("//osbase/build:efi.bzl", "efi_unified_kernel_image")
load("@rules_pkg//:pkg.bzl", "pkg_zip")
load("@rules_pkg//:mappings.bzl", "pkg_files")
@@ -14,7 +14,7 @@
"@com_github_coredns_coredns//:coredns": "/kubernetes/bin/coredns",
},
fsspecs = [
- "//metropolis/node/build:earlydev.fsspec",
+ "//osbase/build:earlydev.fsspec",
":rootfs.fsspec",
],
)
diff --git a/metropolis/node/core/update/update.go b/metropolis/node/core/update/update.go
index 28b2381..b6d2ce4 100644
--- a/metropolis/node/core/update/update.go
+++ b/metropolis/node/core/update/update.go
@@ -23,9 +23,9 @@
"google.golang.org/grpc/status"
"google.golang.org/protobuf/proto"
- "source.monogon.dev/metropolis/node/build/mkimage/osimage"
abloaderpb "source.monogon.dev/metropolis/node/core/abloader/spec"
"source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/build/mkimage/osimage"
"source.monogon.dev/osbase/efivarfs"
"source.monogon.dev/osbase/gpt"
"source.monogon.dev/osbase/kexec"
diff --git a/metropolis/test/nanoswitch/BUILD.bazel b/metropolis/test/nanoswitch/BUILD.bazel
index 4954480..323d53e 100644
--- a/metropolis/test/nanoswitch/BUILD.bazel
+++ b/metropolis/test/nanoswitch/BUILD.bazel
@@ -1,5 +1,5 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("//metropolis/node/build:def.bzl", "node_initramfs")
+load("//osbase/build:def.bzl", "node_initramfs")
go_library(
name = "nanoswitch_lib",
@@ -42,7 +42,7 @@
"@cacerts//file": "/etc/ssl/cert.pem",
},
fsspecs = [
- "//metropolis/node/build:earlydev.fsspec",
+ "//osbase/build:earlydev.fsspec",
],
visibility = ["//metropolis/test:__subpackages__"],
)
diff --git a/metropolis/vm/smoketest/BUILD.bazel b/metropolis/vm/smoketest/BUILD.bazel
index 7d075d8..6225e2d 100644
--- a/metropolis/vm/smoketest/BUILD.bazel
+++ b/metropolis/vm/smoketest/BUILD.bazel
@@ -1,5 +1,5 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("//metropolis/node/build:def.bzl", "node_initramfs")
+load("//osbase/build:def.bzl", "node_initramfs")
go_library(
name = "smoketest_lib",
@@ -21,7 +21,7 @@
"//metropolis/vm/smoketest/payload": "/init",
},
fsspecs = [
- "//metropolis/node/build:earlydev.fsspec",
+ "//osbase/build:earlydev.fsspec",
],
)
diff --git a/metropolis/node/build/BUILD.bazel b/osbase/build/BUILD.bazel
similarity index 100%
rename from metropolis/node/build/BUILD.bazel
rename to osbase/build/BUILD.bazel
diff --git a/metropolis/node/build/def.bzl b/osbase/build/def.bzl
similarity index 96%
rename from metropolis/node/build/def.bzl
rename to osbase/build/def.bzl
index d56d78a..8e9fcd9 100644
--- a/metropolis/node/build/def.bzl
+++ b/osbase/build/def.bzl
@@ -179,7 +179,7 @@
"fsspecs": attr.label_list(
default = [],
doc = """
- List of file system specs (metropolis.node.build.fsspec.FSSpec) to also include in the resulting image.
+ List of file system specs (osbase.build.fsspec.FSSpec) to also include in the resulting image.
These will be merged with all other given attributes.
""",
providers = [FSSpecInfo],
@@ -188,7 +188,7 @@
# Tool
"_mkcpio": attr.label(
- default = Label("//metropolis/node/build/mkcpio"),
+ default = Label("//osbase/build/mkcpio"),
executable = True,
cfg = "exec",
),
@@ -241,7 +241,7 @@
"fsspecs": attr.label_list(
default = [],
doc = """
- List of file system specs (metropolis.node.build.fsspec.FSSpec) to also include in the resulting image.
+ List of file system specs (osbase.build.fsspec.FSSpec) to also include in the resulting image.
These will be merged with all other given attributes.
""",
providers = [FSSpecInfo],
@@ -250,7 +250,7 @@
# Tools, implicit dependencies.
"_mkerofs": attr.label(
- default = Label("//metropolis/node/build/mkerofs"),
+ default = Label("//osbase/build/mkerofs"),
executable = True,
cfg = "host",
),
@@ -322,7 +322,7 @@
),
"_mkverity": attr.label(
doc = "The mkverity executable needed to generate the image.",
- default = "//metropolis/node/build/mkverity",
+ default = "//osbase/build/mkverity",
allow_single_file = True,
executable = True,
cfg = "host",
diff --git a/metropolis/node/build/earlydev.fsspec b/osbase/build/earlydev.fsspec
similarity index 100%
rename from metropolis/node/build/earlydev.fsspec
rename to osbase/build/earlydev.fsspec
diff --git a/metropolis/node/build/efi.bzl b/osbase/build/efi.bzl
similarity index 97%
rename from metropolis/node/build/efi.bzl
rename to osbase/build/efi.bzl
index bf5ad26..2f5f363 100644
--- a/metropolis/node/build/efi.bzl
+++ b/osbase/build/efi.bzl
@@ -4,7 +4,7 @@
"""
load("//build/toolchain/llvm-efi:transition.bzl", "build_efi_transition")
-load("//metropolis/node/build:def.bzl", "VerityConfig")
+load("//osbase/build:def.bzl", "VerityConfig")
def _efi_unified_kernel_image_impl(ctx):
# Find the dependency paths to be passed to mkpayload.
@@ -123,7 +123,7 @@
),
"_mkpayload": attr.label(
doc = "The mkpayload executable.",
- default = "//metropolis/node/build/mkpayload",
+ default = "//osbase/build/mkpayload",
allow_single_file = True,
executable = True,
cfg = "exec",
diff --git a/metropolis/node/build/fsspec/BUILD.bazel b/osbase/build/fsspec/BUILD.bazel
similarity index 81%
rename from metropolis/node/build/fsspec/BUILD.bazel
rename to osbase/build/fsspec/BUILD.bazel
index eeddda7..b719522 100644
--- a/metropolis/node/build/fsspec/BUILD.bazel
+++ b/osbase/build/fsspec/BUILD.bazel
@@ -12,14 +12,14 @@
name = "fsspec",
srcs = ["utils.go"],
embed = [":fsspec_go_proto"],
- importpath = "source.monogon.dev/metropolis/node/build/fsspec",
+ importpath = "source.monogon.dev/osbase/build/fsspec",
visibility = ["//visibility:public"],
deps = ["@org_golang_google_protobuf//encoding/prototext"],
)
go_proto_library(
name = "fsspec_go_proto",
- importpath = "source.monogon.dev/metropolis/node/build/fsspec",
+ importpath = "source.monogon.dev/osbase/build/fsspec",
proto = ":spec_proto",
visibility = ["//visibility:public"],
)
diff --git a/metropolis/node/build/fsspec/spec.proto b/osbase/build/fsspec/spec.proto
similarity index 95%
rename from metropolis/node/build/fsspec/spec.proto
rename to osbase/build/fsspec/spec.proto
index 712de1c..487eebf 100644
--- a/metropolis/node/build/fsspec/spec.proto
+++ b/osbase/build/fsspec/spec.proto
@@ -16,8 +16,8 @@
syntax = "proto3";
-package metropolis.node.build.fsspec;
-option go_package = "source.monogon.dev/metropolis/node/build/fsspec";
+package osbase.node.build.fsspec;
+option go_package = "source.monogon.dev/osbase/build/fsspec";
// FSSpec is the spec from which a filesystem is generated. It consists of files, directories and symbolic
// links. Directories are also automatically inferred when required for the placement of files or symbolic
diff --git a/metropolis/node/build/fsspec/utils.go b/osbase/build/fsspec/utils.go
similarity index 100%
rename from metropolis/node/build/fsspec/utils.go
rename to osbase/build/fsspec/utils.go
diff --git a/metropolis/node/build/fwprune/BUILD.bazel b/osbase/build/fwprune/BUILD.bazel
similarity index 79%
rename from metropolis/node/build/fwprune/BUILD.bazel
rename to osbase/build/fwprune/BUILD.bazel
index e29ac7e..d9b4718 100644
--- a/metropolis/node/build/fwprune/BUILD.bazel
+++ b/osbase/build/fwprune/BUILD.bazel
@@ -3,10 +3,10 @@
go_library(
name = "fwprune_lib",
srcs = ["main.go"],
- importpath = "source.monogon.dev/metropolis/node/build/fwprune",
+ importpath = "source.monogon.dev/osbase/build/fwprune",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/node/build/fsspec",
+ "//osbase/build/fsspec",
"//osbase/kmod",
"@org_golang_google_protobuf//encoding/prototext",
"@org_golang_google_protobuf//proto",
diff --git a/metropolis/node/build/fwprune/def.bzl b/osbase/build/fwprune/def.bzl
similarity index 95%
rename from metropolis/node/build/fwprune/def.bzl
rename to osbase/build/fwprune/def.bzl
index 154009e..4633c93 100644
--- a/metropolis/node/build/fwprune/def.bzl
+++ b/osbase/build/fwprune/def.bzl
@@ -1,4 +1,4 @@
-load("//metropolis/node/build:def.bzl", "FSSpecInfo")
+load("//osbase/build:def.bzl", "FSSpecInfo")
def _fsspec_linux_firmware(ctx):
fsspec_out = ctx.actions.declare_file(ctx.label.name + ".prototxt")
@@ -68,7 +68,7 @@
# Tool
"_fwprune": attr.label(
- default = Label("//metropolis/node/build/fwprune"),
+ default = Label("//osbase/build/fwprune"),
executable = True,
cfg = "exec",
),
diff --git a/metropolis/node/build/fwprune/main.go b/osbase/build/fwprune/main.go
similarity index 98%
rename from metropolis/node/build/fwprune/main.go
rename to osbase/build/fwprune/main.go
index e76e5d0..0bedcfd 100644
--- a/metropolis/node/build/fwprune/main.go
+++ b/osbase/build/fwprune/main.go
@@ -19,7 +19,7 @@
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/proto"
- "source.monogon.dev/metropolis/node/build/fsspec"
+ "source.monogon.dev/osbase/build/fsspec"
"source.monogon.dev/osbase/kmod"
)
diff --git a/metropolis/node/build/genosrelease/BUILD.bazel b/osbase/build/genosrelease/BUILD.bazel
similarity index 85%
rename from metropolis/node/build/genosrelease/BUILD.bazel
rename to osbase/build/genosrelease/BUILD.bazel
index 5ac09d5..f845cae 100644
--- a/metropolis/node/build/genosrelease/BUILD.bazel
+++ b/osbase/build/genosrelease/BUILD.bazel
@@ -3,7 +3,7 @@
go_library(
name = "genosrelease_lib",
srcs = ["main.go"],
- importpath = "source.monogon.dev/metropolis/node/build/genosrelease",
+ importpath = "source.monogon.dev/osbase/build/genosrelease",
visibility = ["//visibility:private"],
deps = ["@com_github_joho_godotenv//:godotenv"],
)
diff --git a/metropolis/node/build/genosrelease/defs.bzl b/osbase/build/genosrelease/defs.bzl
similarity index 95%
rename from metropolis/node/build/genosrelease/defs.bzl
rename to osbase/build/genosrelease/defs.bzl
index 61ce9e4..6fed483 100644
--- a/metropolis/node/build/genosrelease/defs.bzl
+++ b/osbase/build/genosrelease/defs.bzl
@@ -42,7 +42,7 @@
"os_id": attr.string(mandatory = True),
"stamp_var": attr.string(mandatory = True),
"_genosrelease": attr.label(
- default = Label("//metropolis/node/build/genosrelease"),
+ default = Label("//osbase/build/genosrelease"),
cfg = "host",
executable = True,
allow_files = True,
diff --git a/metropolis/node/build/genosrelease/main.go b/osbase/build/genosrelease/main.go
similarity index 100%
rename from metropolis/node/build/genosrelease/main.go
rename to osbase/build/genosrelease/main.go
diff --git a/metropolis/node/build/kconfig-patcher/BUILD.bazel b/osbase/build/kconfig-patcher/BUILD.bazel
similarity index 86%
rename from metropolis/node/build/kconfig-patcher/BUILD.bazel
rename to osbase/build/kconfig-patcher/BUILD.bazel
index 278db21..59ee391 100644
--- a/metropolis/node/build/kconfig-patcher/BUILD.bazel
+++ b/osbase/build/kconfig-patcher/BUILD.bazel
@@ -3,7 +3,7 @@
go_library(
name = "kconfig-patcher_lib",
srcs = ["main.go"],
- importpath = "source.monogon.dev/metropolis/node/build/kconfig-patcher",
+ importpath = "source.monogon.dev/osbase/build/kconfig-patcher",
visibility = ["//visibility:private"],
)
diff --git a/metropolis/node/build/kconfig-patcher/kconfig-patcher.bzl b/osbase/build/kconfig-patcher/kconfig-patcher.bzl
similarity index 89%
rename from metropolis/node/build/kconfig-patcher/kconfig-patcher.bzl
rename to osbase/build/kconfig-patcher/kconfig-patcher.bzl
index 337642e..39e786e 100644
--- a/metropolis/node/build/kconfig-patcher/kconfig-patcher.bzl
+++ b/osbase/build/kconfig-patcher/kconfig-patcher.bzl
@@ -23,10 +23,10 @@
srcs = [src],
outs = [out],
tools = [
- "//metropolis/node/build/kconfig-patcher",
+ "//osbase/build/kconfig-patcher",
],
cmd = """
- $(location //metropolis/node/build/kconfig-patcher) \
+ $(location //osbase/build/kconfig-patcher) \
-in $< -out $@ '%s'
""" % struct(overrides = override_configs).to_json(),
**kwargs
diff --git a/metropolis/node/build/kconfig-patcher/main.go b/osbase/build/kconfig-patcher/main.go
similarity index 100%
rename from metropolis/node/build/kconfig-patcher/main.go
rename to osbase/build/kconfig-patcher/main.go
diff --git a/metropolis/node/build/kconfig-patcher/main_test.go b/osbase/build/kconfig-patcher/main_test.go
similarity index 100%
rename from metropolis/node/build/kconfig-patcher/main_test.go
rename to osbase/build/kconfig-patcher/main_test.go
diff --git a/metropolis/node/build/mkcpio/BUILD.bazel b/osbase/build/mkcpio/BUILD.bazel
similarity index 79%
rename from metropolis/node/build/mkcpio/BUILD.bazel
rename to osbase/build/mkcpio/BUILD.bazel
index 3ea98ae..d281f6d 100644
--- a/metropolis/node/build/mkcpio/BUILD.bazel
+++ b/osbase/build/mkcpio/BUILD.bazel
@@ -3,10 +3,10 @@
go_library(
name = "mkcpio_lib",
srcs = ["main.go"],
- importpath = "source.monogon.dev/metropolis/node/build/mkcpio",
+ importpath = "source.monogon.dev/osbase/build/mkcpio",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/node/build/fsspec",
+ "//osbase/build/fsspec",
"@com_github_cavaliergopher_cpio//:cpio",
"@com_github_klauspost_compress//zstd",
"@org_golang_x_sys//unix",
diff --git a/metropolis/node/build/mkcpio/main.go b/osbase/build/mkcpio/main.go
similarity index 98%
rename from metropolis/node/build/mkcpio/main.go
rename to osbase/build/mkcpio/main.go
index b8f99b9..4886c3c 100644
--- a/metropolis/node/build/mkcpio/main.go
+++ b/osbase/build/mkcpio/main.go
@@ -13,7 +13,7 @@
"github.com/klauspost/compress/zstd"
"golang.org/x/sys/unix"
- "source.monogon.dev/metropolis/node/build/fsspec"
+ "source.monogon.dev/osbase/build/fsspec"
)
var (
diff --git a/metropolis/node/build/mkerofs/BUILD.bazel b/osbase/build/mkerofs/BUILD.bazel
similarity index 74%
rename from metropolis/node/build/mkerofs/BUILD.bazel
rename to osbase/build/mkerofs/BUILD.bazel
index 0befb4c..ce648b9 100644
--- a/metropolis/node/build/mkerofs/BUILD.bazel
+++ b/osbase/build/mkerofs/BUILD.bazel
@@ -3,10 +3,10 @@
go_library(
name = "mkerofs_lib",
srcs = ["main.go"],
- importpath = "source.monogon.dev/metropolis/node/build/mkerofs",
+ importpath = "source.monogon.dev/osbase/build/mkerofs",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node/build/fsspec",
+ "//osbase/build/fsspec",
"//osbase/erofs",
],
)
diff --git a/metropolis/node/build/mkerofs/main.go b/osbase/build/mkerofs/main.go
similarity index 98%
rename from metropolis/node/build/mkerofs/main.go
rename to osbase/build/mkerofs/main.go
index b5d5568..edcfdb9 100644
--- a/metropolis/node/build/mkerofs/main.go
+++ b/osbase/build/mkerofs/main.go
@@ -29,7 +29,7 @@
"sort"
"strings"
- "source.monogon.dev/metropolis/node/build/fsspec"
+ "source.monogon.dev/osbase/build/fsspec"
"source.monogon.dev/osbase/erofs"
)
diff --git a/metropolis/node/build/mkimage/BUILD.bazel b/osbase/build/mkimage/BUILD.bazel
similarity index 78%
rename from metropolis/node/build/mkimage/BUILD.bazel
rename to osbase/build/mkimage/BUILD.bazel
index 41ce603..30ba81f 100644
--- a/metropolis/node/build/mkimage/BUILD.bazel
+++ b/osbase/build/mkimage/BUILD.bazel
@@ -6,12 +6,12 @@
embedsrcs = [
"//metropolis/node/core/abloader", #keep
],
- importpath = "source.monogon.dev/metropolis/node/build/mkimage",
+ importpath = "source.monogon.dev/osbase/build/mkimage",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/node/build/mkimage/osimage",
"//osbase/blkio",
"//osbase/blockdev",
+ "//osbase/build/mkimage/osimage",
],
)
diff --git a/metropolis/node/build/mkimage/def.bzl b/osbase/build/mkimage/def.bzl
similarity index 90%
rename from metropolis/node/build/mkimage/def.bzl
rename to osbase/build/mkimage/def.bzl
index efcebdc..1663e3d 100644
--- a/metropolis/node/build/mkimage/def.bzl
+++ b/osbase/build/mkimage/def.bzl
@@ -24,7 +24,7 @@
implementation = _node_image_impl,
doc = """
Build a disk image from an EFI kernel payload and system partition
- contents. See //metropolis/node/build/mkimage for more information.
+ contents. See //osbase/build/mkimage for more information.
""",
attrs = {
"kernel": attr.label(
@@ -39,7 +39,7 @@
),
"_mkimage": attr.label(
doc = "The mkimage executable.",
- default = "//metropolis/node/build/mkimage",
+ default = "//osbase/build/mkimage",
allow_single_file = True,
executable = True,
cfg = "exec",
diff --git a/metropolis/node/build/mkimage/main.go b/osbase/build/mkimage/main.go
similarity index 94%
rename from metropolis/node/build/mkimage/main.go
rename to osbase/build/mkimage/main.go
index 3a68fc7..d83a03d 100644
--- a/metropolis/node/build/mkimage/main.go
+++ b/osbase/build/mkimage/main.go
@@ -14,12 +14,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// mkimage is a tool to generate Metropolis node disk images.
+// mkimage is a tool to generate node disk images.
// It can be used both to initialize block devices and to create image
// files.
//
// The tool takes a path to an EFI payload (--efi), and a path to a
-// Metropolis system image (--system) as its only required inputs. In
+// system image (--system) as its only required inputs. In
// addition, an output path must be supplied (--out).
// Node parameters file path (--node_parameters) may also be supplied, in
// which case the file will be copied to the EFI system partition.
@@ -33,9 +33,9 @@
"log"
"os"
- "source.monogon.dev/metropolis/node/build/mkimage/osimage"
"source.monogon.dev/osbase/blkio"
"source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/build/mkimage/osimage"
)
//go:embed metropolis/node/core/abloader/abloader_bin.efi
diff --git a/metropolis/node/build/mkimage/osimage/BUILD.bazel b/osbase/build/mkimage/osimage/BUILD.bazel
similarity index 80%
rename from metropolis/node/build/mkimage/osimage/BUILD.bazel
rename to osbase/build/mkimage/osimage/BUILD.bazel
index 9799b81..cfcf096 100644
--- a/metropolis/node/build/mkimage/osimage/BUILD.bazel
+++ b/osbase/build/mkimage/osimage/BUILD.bazel
@@ -3,7 +3,7 @@
go_library(
name = "osimage",
srcs = ["osimage.go"],
- importpath = "source.monogon.dev/metropolis/node/build/mkimage/osimage",
+ importpath = "source.monogon.dev/osbase/build/mkimage/osimage",
visibility = ["//visibility:public"],
deps = [
"//osbase/blockdev",
diff --git a/metropolis/node/build/mkimage/osimage/osimage.go b/osbase/build/mkimage/osimage/osimage.go
similarity index 100%
rename from metropolis/node/build/mkimage/osimage/osimage.go
rename to osbase/build/mkimage/osimage/osimage.go
diff --git a/metropolis/node/build/mkpayload/BUILD.bazel b/osbase/build/mkpayload/BUILD.bazel
similarity index 80%
rename from metropolis/node/build/mkpayload/BUILD.bazel
rename to osbase/build/mkpayload/BUILD.bazel
index b092791..7e49388 100644
--- a/metropolis/node/build/mkpayload/BUILD.bazel
+++ b/osbase/build/mkpayload/BUILD.bazel
@@ -9,6 +9,6 @@
go_library(
name = "mkpayload_lib",
srcs = ["mkpayload.go"],
- importpath = "source.monogon.dev/metropolis/node/build/mkpayload",
+ importpath = "source.monogon.dev/osbase/build/mkpayload",
visibility = ["//visibility:private"],
)
diff --git a/metropolis/node/build/mkpayload/mkpayload.go b/osbase/build/mkpayload/mkpayload.go
similarity index 100%
rename from metropolis/node/build/mkpayload/mkpayload.go
rename to osbase/build/mkpayload/mkpayload.go
diff --git a/metropolis/node/build/mkucode/BUILD.bazel b/osbase/build/mkucode/BUILD.bazel
similarity index 77%
rename from metropolis/node/build/mkucode/BUILD.bazel
rename to osbase/build/mkucode/BUILD.bazel
index c1f5667..9f56e10 100644
--- a/metropolis/node/build/mkucode/BUILD.bazel
+++ b/osbase/build/mkucode/BUILD.bazel
@@ -3,10 +3,10 @@
go_library(
name = "mkucode_lib",
srcs = ["main.go"],
- importpath = "source.monogon.dev/metropolis/node/build/mkucode",
+ importpath = "source.monogon.dev/osbase/build/mkucode",
visibility = ["//visibility:private"],
deps = [
- "//metropolis/node/build/mkucode/spec",
+ "//osbase/build/mkucode/spec",
"@com_github_cavaliergopher_cpio//:cpio",
"@org_golang_google_protobuf//encoding/prototext",
],
diff --git a/metropolis/node/build/mkucode/def.bzl b/osbase/build/mkucode/def.bzl
similarity index 95%
rename from metropolis/node/build/mkucode/def.bzl
rename to osbase/build/mkucode/def.bzl
index 3faa775..04d83a2 100644
--- a/metropolis/node/build/mkucode/def.bzl
+++ b/osbase/build/mkucode/def.bzl
@@ -37,7 +37,7 @@
# Tool
"_mkucode": attr.label(
- default = Label("//metropolis/node/build/mkucode"),
+ default = Label("//osbase/build/mkucode"),
executable = True,
cfg = "exec",
),
diff --git a/metropolis/node/build/mkucode/main.go b/osbase/build/mkucode/main.go
similarity index 94%
rename from metropolis/node/build/mkucode/main.go
rename to osbase/build/mkucode/main.go
index 1cd8960..58561e3 100644
--- a/metropolis/node/build/mkucode/main.go
+++ b/osbase/build/mkucode/main.go
@@ -13,11 +13,11 @@
"github.com/cavaliergopher/cpio"
"google.golang.org/protobuf/encoding/prototext"
- "source.monogon.dev/metropolis/node/build/mkucode/spec"
+ "source.monogon.dev/osbase/build/mkucode/spec"
)
var (
- specPath = flag.String("spec", "", "Path to prototext specification (metropolis.node.build.mkucode.UCode)")
+ specPath = flag.String("spec", "", "Path to prototext specification (osbase.build.mkucode.UCode)")
outPath = flag.String("out", "", "Output path for cpio to be prepend to initrd")
)
diff --git a/metropolis/node/build/mkucode/spec/BUILD.bazel b/osbase/build/mkucode/spec/BUILD.bazel
similarity index 74%
rename from metropolis/node/build/mkucode/spec/BUILD.bazel
rename to osbase/build/mkucode/spec/BUILD.bazel
index 84e7c7b..0210a4b 100644
--- a/metropolis/node/build/mkucode/spec/BUILD.bazel
+++ b/osbase/build/mkucode/spec/BUILD.bazel
@@ -10,7 +10,7 @@
go_proto_library(
name = "mkucode_go_proto",
- importpath = "source.monogon.dev/metropolis/node/build/mkucode",
+ importpath = "source.monogon.dev/osbase/build/mkucode",
proto = ":mkucode_proto",
visibility = ["//visibility:public"],
)
@@ -18,13 +18,13 @@
go_library(
name = "spec",
embed = [":spec_go_proto"],
- importpath = "source.monogon.dev/metropolis/node/build/mkucode/spec",
+ importpath = "source.monogon.dev/osbase/build/mkucode/spec",
visibility = ["//visibility:public"],
)
go_proto_library(
name = "spec_go_proto",
- importpath = "source.monogon.dev/metropolis/node/build/mkucode/spec",
+ importpath = "source.monogon.dev/osbase/build/mkucode/spec",
proto = ":mkucode_proto",
visibility = ["//visibility:public"],
)
diff --git a/metropolis/node/build/mkucode/spec/gomod-generated-placeholder.go b/osbase/build/mkucode/spec/gomod-generated-placeholder.go
similarity index 100%
rename from metropolis/node/build/mkucode/spec/gomod-generated-placeholder.go
rename to osbase/build/mkucode/spec/gomod-generated-placeholder.go
diff --git a/metropolis/node/build/mkucode/spec/spec.proto b/osbase/build/mkucode/spec/spec.proto
similarity index 73%
rename from metropolis/node/build/mkucode/spec/spec.proto
rename to osbase/build/mkucode/spec/spec.proto
index ed537c5..36fcc4c 100644
--- a/metropolis/node/build/mkucode/spec/spec.proto
+++ b/osbase/build/mkucode/spec/spec.proto
@@ -1,7 +1,7 @@
syntax = "proto3";
-package metropolis.node.build.mkucode;
-option go_package = "source.monogon.dev/metropolis/node/build/mkucode/spec";
+package osbase.build.mkucode;
+option go_package = "source.monogon.dev/osbase/build/mkucode/spec";
message UCode {
repeated UCodeVendor vendor = 1;
diff --git a/metropolis/node/build/mkverity/BUILD.bazel b/osbase/build/mkverity/BUILD.bazel
similarity index 86%
rename from metropolis/node/build/mkverity/BUILD.bazel
rename to osbase/build/mkverity/BUILD.bazel
index a748b86..04a8a54 100644
--- a/metropolis/node/build/mkverity/BUILD.bazel
+++ b/osbase/build/mkverity/BUILD.bazel
@@ -13,7 +13,7 @@
go_library(
name = "mkverity_lib",
srcs = ["mkverity.go"],
- importpath = "source.monogon.dev/metropolis/node/build/mkverity",
+ importpath = "source.monogon.dev/osbase/build/mkverity",
visibility = ["//visibility:private"],
deps = ["//osbase/verity"],
)
diff --git a/metropolis/node/build/mkverity/mkverity.go b/osbase/build/mkverity/mkverity.go
similarity index 100%
rename from metropolis/node/build/mkverity/mkverity.go
rename to osbase/build/mkverity/mkverity.go
diff --git a/osbase/kmod/BUILD.bazel b/osbase/kmod/BUILD.bazel
index a8ade05..4bf0fb5 100644
--- a/osbase/kmod/BUILD.bazel
+++ b/osbase/kmod/BUILD.bazel
@@ -1,5 +1,5 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-load("//metropolis/node/build/fwprune:def.bzl", "fsspec_linux_firmware")
+load("//osbase/build/fwprune:def.bzl", "fsspec_linux_firmware")
load("//osbase/test/ktest:ktest.bzl", "ktest")
go_library(
diff --git a/osbase/logtree/unraw/unraw.go b/osbase/logtree/unraw/unraw.go
index 5c4e8e9..a1f2624 100644
--- a/osbase/logtree/unraw/unraw.go
+++ b/osbase/logtree/unraw/unraw.go
@@ -1,5 +1,5 @@
-// unraw implements a facility to convert raw logs from external sources into
-// leveled logs.
+// Package unraw implements a facility to convert raw logs from external sources
+// into leveled logs.
//
// This is not the same as raw logging inside the logtree, which exists to
// ingest logs that are either fully arbitrary or do not map cleanly to the
diff --git a/osbase/socksproxy/socksproxy.go b/osbase/socksproxy/socksproxy.go
index 808ae1f..2dd0c35 100644
--- a/osbase/socksproxy/socksproxy.go
+++ b/osbase/socksproxy/socksproxy.go
@@ -1,4 +1,4 @@
-// package socksproxy implements a limited subset of the SOCKS 5 (RFC1928)
+// Package socksproxy implements a limited subset of the SOCKS 5 (RFC1928)
// protocol in the form of a pluggable Proxy object. However, this
// implementation is _not_ RFC1928 compliant, as it does not implement GSSAPI
// (which is mandated by the spec). It currently only implements CONNECT
diff --git a/osbase/test/ktest/BUILD.bazel b/osbase/test/ktest/BUILD.bazel
index 16612e5..733d695 100644
--- a/osbase/test/ktest/BUILD.bazel
+++ b/osbase/test/ktest/BUILD.bazel
@@ -1,5 +1,5 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("//metropolis/node/build/kconfig-patcher:kconfig-patcher.bzl", "kconfig_patch")
+load("//osbase/build/kconfig-patcher:kconfig-patcher.bzl", "kconfig_patch")
load("//third_party/linux:def.bzl", "linux_image")
go_library(
diff --git a/osbase/test/ktest/ktest.bzl b/osbase/test/ktest/ktest.bzl
index a9f5fdd..614832d 100644
--- a/osbase/test/ktest/ktest.bzl
+++ b/osbase/test/ktest/ktest.bzl
@@ -18,7 +18,7 @@
Ktest provides a macro to run tests under a normal Metropolis node kernel
"""
-load("//metropolis/node/build:def.bzl", "node_initramfs")
+load("//osbase/build:def.bzl", "node_initramfs")
def _dict_union(x, y):
z = {}
@@ -30,7 +30,7 @@
node_initramfs(
name = "test_initramfs",
fsspecs = [
- "//metropolis/node/build:earlydev.fsspec",
+ "//osbase/build:earlydev.fsspec",
] + fsspecs,
files = _dict_union({
"//osbase/test/ktest/init": "/init",
diff --git a/osbase/tpm/proto/tpm.proto b/osbase/tpm/proto/tpm.proto
index e5455d2..fc70223 100644
--- a/osbase/tpm/proto/tpm.proto
+++ b/osbase/tpm/proto/tpm.proto
@@ -1,6 +1,6 @@
syntax = "proto3";
option go_package = "source.monogon.dev/osbase/tpm/proto";
-package metropolis.pkg.tpm;
+package osbase.pkg.tpm;
import "proto/tpm/tpm.proto";
diff --git a/third_party/BUILD.bazel b/third_party/BUILD.bazel
index 7df30fe..6920dfa 100644
--- a/third_party/BUILD.bazel
+++ b/third_party/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//metropolis/node/build/fwprune:def.bzl", "fsspec_linux_firmware")
+load("//osbase/build/fwprune:def.bzl", "fsspec_linux_firmware")
fsspec_linux_firmware(
name = "firmware",
@@ -8,7 +8,7 @@
visibility = ["//visibility:public"],
)
-load("//metropolis/node/build/mkucode:def.bzl", "cpio_ucode")
+load("//osbase/build/mkucode:def.bzl", "cpio_ucode")
cpio_ucode(
name = "ucode",