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/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(