third_party: expose firmware and ucode targets
That way we don't have to redefine it with every target that does
any kind of takeover.
Change-Id: I816b42a87c755da7b42944b2768f71b53d8d77f3
Reviewed-on: https://review.monogon.dev/c/monogon/+/2929
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/metropolis/installer/BUILD.bazel b/metropolis/installer/BUILD.bazel
index 3b4144c..f94d134 100644
--- a/metropolis/installer/BUILD.bazel
+++ b/metropolis/installer/BUILD.bazel
@@ -51,7 +51,7 @@
name = "kernel",
cmdline = "console=ttyS0,115200 console=tty0 quiet",
initrd = [
- "//metropolis/node:ucode",
+ "//third_party:ucode",
":initramfs",
],
kernel = "//third_party/linux",
diff --git a/metropolis/node/BUILD.bazel b/metropolis/node/BUILD.bazel
index 52c5d56..b056dc3 100644
--- a/metropolis/node/BUILD.bazel
+++ b/metropolis/node/BUILD.bazel
@@ -2,8 +2,6 @@
load("//metropolis/node/build:def.bzl", "erofs_image", "verity_image")
load("//metropolis/node/build:efi.bzl", "efi_unified_kernel_image")
load("//metropolis/node/build/mkimage:def.bzl", "node_image")
-load("//metropolis/node/build/fwprune:def.bzl", "fsspec_linux_firmware")
-load("//metropolis/node/build/mkucode:def.bzl", "cpio_ucode")
load("@rules_pkg//:pkg.bzl", "pkg_zip")
go_library(
@@ -30,22 +28,6 @@
},
)
-fsspec_linux_firmware(
- name = "firmware",
- firmware_files = ["@linux-firmware//:all_files"],
- kernel = "//third_party/linux",
- metadata = "@linux-firmware//:metadata",
-)
-
-cpio_ucode(
- name = "ucode",
- ucode = {
- "@linux-firmware//:amd_ucode": "AuthenticAMD",
- "@intel_ucode//:fam6h": "GenuineIntel",
- },
- visibility = ["//metropolis:__subpackages__"],
-)
-
erofs_image(
name = "rootfs",
files = {
@@ -104,7 +86,7 @@
fsspecs = [
":erofs-layout.fsspec",
"//metropolis/node/build:earlydev.fsspec",
- ":firmware",
+ "//third_party:firmware",
],
symlinks = {
"/ephemeral/machine-id": "/etc/machine-id",
@@ -120,7 +102,7 @@
efi_unified_kernel_image(
name = "kernel_efi",
cmdline = "console=ttyS0,115200 console=ttyS1,115200 console=tty0 quiet rootfstype=erofs init=/init loadpin.exclude=kexec-image,kexec-initramfs kernel.unknown_nmi_panic=1",
- initrd = [":ucode"],
+ initrd = ["//third_party:ucode"],
kernel = "//third_party/linux",
os_release = ":os-release-info",
verity = ":verity_rootfs",