treewide: introduce osbase package and move things around
All except localregistry moved from metropolis/pkg to osbase,
localregistry moved to metropolis/test as its only used there anyway.
Change-Id: If1a4bf377364bef0ac23169e1b90379c71b06d72
Reviewed-on: https://review.monogon.dev/c/monogon/+/3079
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/node/core/update/BUILD.bazel b/metropolis/node/core/update/BUILD.bazel
index bc5561a..30ca20b 100644
--- a/metropolis/node/core/update/BUILD.bazel
+++ b/metropolis/node/core/update/BUILD.bazel
@@ -11,11 +11,11 @@
deps = [
"//metropolis/node/build/mkimage/osimage",
"//metropolis/node/core/abloader/spec",
- "//metropolis/pkg/blockdev",
- "//metropolis/pkg/efivarfs",
- "//metropolis/pkg/gpt",
- "//metropolis/pkg/kexec",
- "//metropolis/pkg/logtree",
+ "//osbase/blockdev",
+ "//osbase/efivarfs",
+ "//osbase/gpt",
+ "//osbase/kexec",
+ "//osbase/logtree",
"@com_github_cenkalti_backoff_v4//:backoff",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//status",
diff --git a/metropolis/node/core/update/e2e/BUILD.bazel b/metropolis/node/core/update/e2e/BUILD.bazel
index 0b3fbce..b96006c 100644
--- a/metropolis/node/core/update/e2e/BUILD.bazel
+++ b/metropolis/node/core/update/e2e/BUILD.bazel
@@ -16,8 +16,8 @@
],
deps = [
"//metropolis/node/build/mkimage/osimage",
- "//metropolis/pkg/blkio",
- "//metropolis/pkg/blockdev",
+ "//osbase/blkio",
+ "//osbase/blockdev",
"@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 0f712a8..07c6bf4 100644
--- a/metropolis/node/core/update/e2e/e2e_test.go
+++ b/metropolis/node/core/update/e2e/e2e_test.go
@@ -19,8 +19,8 @@
"github.com/bazelbuild/rules_go/go/runfiles"
"source.monogon.dev/metropolis/node/build/mkimage/osimage"
- "source.monogon.dev/metropolis/pkg/blkio"
- "source.monogon.dev/metropolis/pkg/blockdev"
+ "source.monogon.dev/osbase/blkio"
+ "source.monogon.dev/osbase/blockdev"
)
const Mi = 1024 * 1024
diff --git a/metropolis/node/core/update/e2e/testos/BUILD.bazel b/metropolis/node/core/update/e2e/testos/BUILD.bazel
index 79fd0f9..275a44c 100644
--- a/metropolis/node/core/update/e2e/testos/BUILD.bazel
+++ b/metropolis/node/core/update/e2e/testos/BUILD.bazel
@@ -16,10 +16,10 @@
"//metropolis/node/build/mkimage/osimage",
"//metropolis/node/core/network",
"//metropolis/node/core/update",
- "//metropolis/pkg/blockdev",
- "//metropolis/pkg/gpt",
- "//metropolis/pkg/logtree",
- "//metropolis/pkg/supervisor",
+ "//osbase/blockdev",
+ "//osbase/gpt",
+ "//osbase/logtree",
+ "//osbase/supervisor",
"@org_golang_x_sys//unix",
],
)
diff --git a/metropolis/node/core/update/e2e/testos/main.go b/metropolis/node/core/update/e2e/testos/main.go
index 95f865c..e77a4e2 100644
--- a/metropolis/node/core/update/e2e/testos/main.go
+++ b/metropolis/node/core/update/e2e/testos/main.go
@@ -11,10 +11,10 @@
"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/metropolis/pkg/blockdev"
- "source.monogon.dev/metropolis/pkg/gpt"
- "source.monogon.dev/metropolis/pkg/logtree"
- "source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/gpt"
+ "source.monogon.dev/osbase/logtree"
+ "source.monogon.dev/osbase/supervisor"
)
var Variant = "U"
diff --git a/metropolis/node/core/update/update.go b/metropolis/node/core/update/update.go
index 8490c78..28b2381 100644
--- a/metropolis/node/core/update/update.go
+++ b/metropolis/node/core/update/update.go
@@ -25,11 +25,11 @@
"source.monogon.dev/metropolis/node/build/mkimage/osimage"
abloaderpb "source.monogon.dev/metropolis/node/core/abloader/spec"
- "source.monogon.dev/metropolis/pkg/blockdev"
- "source.monogon.dev/metropolis/pkg/efivarfs"
- "source.monogon.dev/metropolis/pkg/gpt"
- "source.monogon.dev/metropolis/pkg/kexec"
- "source.monogon.dev/metropolis/pkg/logtree"
+ "source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/efivarfs"
+ "source.monogon.dev/osbase/gpt"
+ "source.monogon.dev/osbase/kexec"
+ "source.monogon.dev/osbase/logtree"
)
// Service contains data and functionality to perform A/B updates on a