metropolis/node: move misplaced packages out of core
abloader, bios_bootcode and minit don't run as part of the core process,
so it doesn't make sense to have them in //metropolis/node/core.
This changes moves these three to //metropolis/node.
Change-Id: I908efb311a138f07a9f1de8e3c23437ff00131ee
Reviewed-on: https://review.monogon.dev/c/monogon/+/4196
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/node/core/update/BUILD.bazel b/metropolis/node/core/update/BUILD.bazel
index 8dac43e..532b917 100644
--- a/metropolis/node/core/update/BUILD.bazel
+++ b/metropolis/node/core/update/BUILD.bazel
@@ -4,13 +4,13 @@
name = "update",
srcs = ["update.go"],
embedsrcs = [
- "//metropolis/node/core/abloader", #keep
+ "//metropolis/node/abloader", #keep
],
importpath = "source.monogon.dev/metropolis/node/core/update",
visibility = ["//visibility:public"],
deps = [
"//go/logging",
- "//metropolis/node/core/abloader/spec",
+ "//metropolis/node/abloader/spec",
"//metropolis/proto/api",
"//metropolis/version",
"//osbase/blockdev",
diff --git a/metropolis/node/core/update/e2e/BUILD.bazel b/metropolis/node/core/update/e2e/BUILD.bazel
index 5dcf3f7..a5dcc5e 100644
--- a/metropolis/node/core/update/e2e/BUILD.bazel
+++ b/metropolis/node/core/update/e2e/BUILD.bazel
@@ -10,7 +10,7 @@
# For the initial image creation
"//metropolis/node/core/update/e2e/testos:verity_rootfs_x",
"//metropolis/node/core/update/e2e/testos:kernel_efi_x",
- "//metropolis/node/core/abloader",
+ "//metropolis/node/abloader",
# For the two update tests
"//metropolis/node/core/update/e2e/testos:testos_image_y",
"//metropolis/node/core/update/e2e/testos:testos_image_z",
@@ -22,7 +22,7 @@
"xOvmfCodePath": "$(rlocationpath //third_party/edk2:OVMF_CODE.fd )",
"xBootPath": "$(rlocationpath //metropolis/node/core/update/e2e/testos:kernel_efi_x )",
"xSystemXPath": "$(rlocationpath //metropolis/node/core/update/e2e/testos:verity_rootfs_x )",
- "xAbloaderPath": "$(rlocationpath //metropolis/node/core/abloader )",
+ "xAbloaderPath": "$(rlocationpath //metropolis/node/abloader )",
},
deps = [
"//osbase/blockdev",
diff --git a/metropolis/node/core/update/update.go b/metropolis/node/core/update/update.go
index 6e41768..3d3060d 100644
--- a/metropolis/node/core/update/update.go
+++ b/metropolis/node/core/update/update.go
@@ -36,7 +36,7 @@
"source.monogon.dev/osbase/oci/registry"
"source.monogon.dev/version"
- abloaderpb "source.monogon.dev/metropolis/node/core/abloader/spec"
+ abloaderpb "source.monogon.dev/metropolis/node/abloader/spec"
apb "source.monogon.dev/metropolis/proto/api"
)
@@ -425,7 +425,7 @@
return nil
}
-//go:embed metropolis/node/core/abloader/abloader_bin.efi
+//go:embed metropolis/node/abloader/abloader_bin.efi
var abloader []byte
func (s *Service) fixupPreloader() error {