From ca257a849563f442df98e38d34eb30a4af261c3e Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Sat, 22 Jun 2024 12:12:05 -0700
Subject: [PATCH] Remove symlinked test key

---
 build.zig                 | 3 +++
 pkgs/tinyboot/default.nix | 6 +-----
 src/test.zig              | 1 -
 src/test_key              | 1 -
 4 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 120000 src/test_key

diff --git a/build.zig b/build.zig
index b76358c..8bbcf67 100644
--- a/build.zig
+++ b/build.zig
@@ -42,6 +42,9 @@ pub fn build(b: *std.Build) !void {
             .strip = optimize != std.builtin.OptimizeMode.Debug,
         });
         tboot_loader.root_module.addOptions("build_options", tboot_loader_options);
+        tboot_loader.root_module.addAnonymousImport("test_key", .{
+            .root_source_file = b.path("test/keys/tboot/key.der"),
+        });
         tboot_loader.root_module.addImport("linux_headers", linux_headers_module);
 
         const cpio_tool = b.addRunArtifact(b.addExecutable(.{
diff --git a/pkgs/tinyboot/default.nix b/pkgs/tinyboot/default.nix
index dea9c8a..79a0eeb 100644
--- a/pkgs/tinyboot/default.nix
+++ b/pkgs/tinyboot/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation (
         ../../build.zig
         ../../build.zig.zon
         ../../src
+        ../../test/keys/tboot/key.der
       ];
     };
 
@@ -61,11 +62,6 @@ stdenv.mkDerivation (
     # probably a nixpkgs bug.
     zigCheckFlags = finalAttrs.zigBuildFlags;
 
-    # TODO(jared): make embedFile work better with the test key
-    preConfigure = ''
-      ln -sf ${../../test/keys/tboot/key.der} src/test_key
-    '';
-
     postInstall = lib.optionalString withLoader ''
       xz --check=crc32 --lzma2=dict=512KiB $out/tboot-loader.cpio
     '';
diff --git a/src/test.zig b/src/test.zig
index cce680d..d7664d9 100644
--- a/src/test.zig
+++ b/src/test.zig
@@ -8,7 +8,6 @@ pub const filesystem = @import("./disk/filesystem.zig");
 pub const log = @import("./log.zig");
 pub const message = @import("./message.zig");
 pub const partition_table = @import("./disk/partition_table.zig");
-pub const security = @import("./security.zig");
 pub const server = @import("./server.zig");
 pub const system = @import("./system.zig");
 pub const tmp = @import("./tmp.zig");
diff --git a/src/test_key b/src/test_key
deleted file mode 120000
index 38432b2..0000000
--- a/src/test_key
+++ /dev/null
@@ -1 +0,0 @@
-../test/keys/tboot/key.der
\ No newline at end of file