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/build/fwprune/BUILD.bazel b/metropolis/node/build/fwprune/BUILD.bazel
index bc22665..e29ac7e 100644
--- a/metropolis/node/build/fwprune/BUILD.bazel
+++ b/metropolis/node/build/fwprune/BUILD.bazel
@@ -7,7 +7,7 @@
visibility = ["//visibility:private"],
deps = [
"//metropolis/node/build/fsspec",
- "//metropolis/pkg/kmod",
+ "//osbase/kmod",
"@org_golang_google_protobuf//encoding/prototext",
"@org_golang_google_protobuf//proto",
],
diff --git a/metropolis/node/build/fwprune/main.go b/metropolis/node/build/fwprune/main.go
index 4f26fa0..e76e5d0 100644
--- a/metropolis/node/build/fwprune/main.go
+++ b/metropolis/node/build/fwprune/main.go
@@ -20,7 +20,7 @@
"google.golang.org/protobuf/proto"
"source.monogon.dev/metropolis/node/build/fsspec"
- "source.monogon.dev/metropolis/pkg/kmod"
+ "source.monogon.dev/osbase/kmod"
)
// linkRegexp parses the Link: lines in the WHENCE file. This does not have
diff --git a/metropolis/node/build/kconfig-patcher/BUILD.bazel b/metropolis/node/build/kconfig-patcher/BUILD.bazel
index e838f9e..278db21 100644
--- a/metropolis/node/build/kconfig-patcher/BUILD.bazel
+++ b/metropolis/node/build/kconfig-patcher/BUILD.bazel
@@ -12,7 +12,7 @@
embed = [":kconfig-patcher_lib"],
visibility = [
"//metropolis/node:__pkg__",
- "//metropolis/test/ktest:__pkg__",
+ "//osbase/test/ktest:__pkg__",
],
)
diff --git a/metropolis/node/build/mkerofs/BUILD.bazel b/metropolis/node/build/mkerofs/BUILD.bazel
index 73fda98..0befb4c 100644
--- a/metropolis/node/build/mkerofs/BUILD.bazel
+++ b/metropolis/node/build/mkerofs/BUILD.bazel
@@ -7,7 +7,7 @@
visibility = ["//visibility:public"],
deps = [
"//metropolis/node/build/fsspec",
- "//metropolis/pkg/erofs",
+ "//osbase/erofs",
],
)
diff --git a/metropolis/node/build/mkerofs/main.go b/metropolis/node/build/mkerofs/main.go
index ac0042a..b5d5568 100644
--- a/metropolis/node/build/mkerofs/main.go
+++ b/metropolis/node/build/mkerofs/main.go
@@ -30,7 +30,7 @@
"strings"
"source.monogon.dev/metropolis/node/build/fsspec"
- "source.monogon.dev/metropolis/pkg/erofs"
+ "source.monogon.dev/osbase/erofs"
)
func (spec *entrySpec) writeRecursive(w *erofs.Writer, pathname string) {
diff --git a/metropolis/node/build/mkimage/BUILD.bazel b/metropolis/node/build/mkimage/BUILD.bazel
index ad88acb..41ce603 100644
--- a/metropolis/node/build/mkimage/BUILD.bazel
+++ b/metropolis/node/build/mkimage/BUILD.bazel
@@ -10,8 +10,8 @@
visibility = ["//visibility:private"],
deps = [
"//metropolis/node/build/mkimage/osimage",
- "//metropolis/pkg/blkio",
- "//metropolis/pkg/blockdev",
+ "//osbase/blkio",
+ "//osbase/blockdev",
],
)
diff --git a/metropolis/node/build/mkimage/main.go b/metropolis/node/build/mkimage/main.go
index 7de951e..3695054 100644
--- a/metropolis/node/build/mkimage/main.go
+++ b/metropolis/node/build/mkimage/main.go
@@ -34,8 +34,8 @@
"os"
"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"
)
//go:embed metropolis/node/core/abloader/abloader_bin.efi
diff --git a/metropolis/node/build/mkimage/osimage/BUILD.bazel b/metropolis/node/build/mkimage/osimage/BUILD.bazel
index cfbf736..9799b81 100644
--- a/metropolis/node/build/mkimage/osimage/BUILD.bazel
+++ b/metropolis/node/build/mkimage/osimage/BUILD.bazel
@@ -6,10 +6,10 @@
importpath = "source.monogon.dev/metropolis/node/build/mkimage/osimage",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/pkg/blockdev",
- "//metropolis/pkg/efivarfs",
- "//metropolis/pkg/fat32",
- "//metropolis/pkg/gpt",
+ "//osbase/blockdev",
+ "//osbase/efivarfs",
+ "//osbase/fat32",
+ "//osbase/gpt",
"@com_github_google_uuid//:uuid",
],
)
diff --git a/metropolis/node/build/mkimage/osimage/osimage.go b/metropolis/node/build/mkimage/osimage/osimage.go
index d0ccaef..f877ded 100644
--- a/metropolis/node/build/mkimage/osimage/osimage.go
+++ b/metropolis/node/build/mkimage/osimage/osimage.go
@@ -25,10 +25,10 @@
"github.com/google/uuid"
- "source.monogon.dev/metropolis/pkg/blockdev"
- "source.monogon.dev/metropolis/pkg/efivarfs"
- "source.monogon.dev/metropolis/pkg/fat32"
- "source.monogon.dev/metropolis/pkg/gpt"
+ "source.monogon.dev/osbase/blockdev"
+ "source.monogon.dev/osbase/efivarfs"
+ "source.monogon.dev/osbase/fat32"
+ "source.monogon.dev/osbase/gpt"
)
var (
diff --git a/metropolis/node/build/mkverity/BUILD.bazel b/metropolis/node/build/mkverity/BUILD.bazel
index caabc26..a748b86 100644
--- a/metropolis/node/build/mkverity/BUILD.bazel
+++ b/metropolis/node/build/mkverity/BUILD.bazel
@@ -15,5 +15,5 @@
srcs = ["mkverity.go"],
importpath = "source.monogon.dev/metropolis/node/build/mkverity",
visibility = ["//visibility:private"],
- deps = ["//metropolis/pkg/verity"],
+ deps = ["//osbase/verity"],
)
diff --git a/metropolis/node/build/mkverity/mkverity.go b/metropolis/node/build/mkverity/mkverity.go
index f44b601..ff2807b 100644
--- a/metropolis/node/build/mkverity/mkverity.go
+++ b/metropolis/node/build/mkverity/mkverity.go
@@ -19,7 +19,7 @@
// outputs a Verity mapping table on success.
//
// For more information, see:
-// - source.monogon.dev/metropolis/pkg/verity
+// - source.monogon.dev/osbase/verity
// - https://gitlab.com/cryptsetup/cryptsetup/wikis/DMVerity
package main
@@ -30,7 +30,7 @@
"log"
"os"
- "source.monogon.dev/metropolis/pkg/verity"
+ "source.monogon.dev/osbase/verity"
)
// createImage creates a dm-verity target image by combining the input image