treewide: remove build_static_transition
We now build everything statically on Linux. This means we don't need
the build_static_transition anymore, as it has become a no-op.
Change-Id: Id6b978daf09bf3e8e252d00da3795909d7ce3b75
Reviewed-on: https://review.monogon.dev/c/monogon/+/4414
Tested-by: Jenkins CI
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
diff --git a/metropolis/cli/metroctl/cmd_install_ssh.go b/metropolis/cli/metroctl/cmd_install_ssh.go
index 3dec0d4..014e6b1 100644
--- a/metropolis/cli/metroctl/cmd_install_ssh.go
+++ b/metropolis/cli/metroctl/cmd_install_ssh.go
@@ -204,7 +204,7 @@
if err != nil {
return err
}
- takeover, err := externalFile("takeover", "_main/metropolis/cli/takeover/takeover_bin_/takeover_bin", &takeoverPath)
+ takeover, err := externalFile("takeover", "_main/metropolis/cli/takeover/takeover_/takeover", &takeoverPath)
if err != nil {
return err
}
diff --git a/metropolis/cli/takeover/BUILD.bazel b/metropolis/cli/takeover/BUILD.bazel
index 8e51836..cbe1934 100644
--- a/metropolis/cli/takeover/BUILD.bazel
+++ b/metropolis/cli/takeover/BUILD.bazel
@@ -1,5 +1,4 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("//osbase/build:def.bzl", "build_static_target")
load("//osbase/build/mkcpio:def.bzl", "node_initramfs")
node_initramfs(
@@ -52,13 +51,7 @@
)
go_binary(
- name = "takeover_bin",
- embed = [":takeover_lib"],
- visibility = ["//visibility:public"],
-)
-
-build_static_target(
name = "takeover",
- dep = ":takeover_bin",
+ embed = [":takeover_lib"],
visibility = ["//visibility:public"],
)
diff --git a/metropolis/cli/takeover/install.go b/metropolis/cli/takeover/install.go
index d58d89c..97e8565 100644
--- a/metropolis/cli/takeover/install.go
+++ b/metropolis/cli/takeover/install.go
@@ -18,7 +18,7 @@
"source.monogon.dev/osbase/structfs"
)
-//go:embed metropolis/node/abloader/abloader_bin.efi
+//go:embed metropolis/node/abloader/abloader.efi
var abloader []byte
// EnvInstallTarget environment variable which tells the takeover binary where
diff --git a/metropolis/installer/main.go b/metropolis/installer/main.go
index 930c472..735a8cd 100644
--- a/metropolis/installer/main.go
+++ b/metropolis/installer/main.go
@@ -31,7 +31,7 @@
"source.monogon.dev/osbase/sysfs"
)
-//go:embed metropolis/node/abloader/abloader_bin.efi
+//go:embed metropolis/node/abloader/abloader.efi
var abloader []byte
//go:embed build/copyright_line.txt
diff --git a/metropolis/node/abloader/BUILD.bazel b/metropolis/node/abloader/BUILD.bazel
index e8bd06e..cb9dc2c 100644
--- a/metropolis/node/abloader/BUILD.bazel
+++ b/metropolis/node/abloader/BUILD.bazel
@@ -1,8 +1,7 @@
load("@rules_rust//rust:defs.bzl", "rust_binary")
-load("//osbase/build:def.bzl", "ignore_unused_configuration_target")
rust_binary(
- name = "abloader_bin",
+ name = "abloader",
srcs = ["main.rs"],
edition = "2021",
platform = select({
@@ -16,16 +15,10 @@
target_compatible_with = [
"@platforms//os:uefi",
],
- visibility = ["//visibility:private"],
+ visibility = ["//visibility:public"],
deps = [
"//metropolis/node/abloader/spec:abloader_proto_rs",
"@crate_index_efi//:prost",
"@crate_index_efi//:uefi",
],
)
-
-ignore_unused_configuration_target(
- name = "abloader",
- dep = ":abloader_bin",
- visibility = ["//visibility:public"],
-)
diff --git a/metropolis/node/core/update/update.go b/metropolis/node/core/update/update.go
index d37bb38..66e7501 100644
--- a/metropolis/node/core/update/update.go
+++ b/metropolis/node/core/update/update.go
@@ -424,7 +424,7 @@
return nil
}
-//go:embed metropolis/node/abloader/abloader_bin.efi
+//go:embed metropolis/node/abloader/abloader.efi
var abloader []byte
func (s *Service) fixupPreloader() error {