From e2c362ea1777d536aa2aa3a5fad21ad0ee07c413 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 17 Aug 2022 07:44:03 -0600
Subject: [PATCH] Use bootloader package

---
 config/acid.toml    | 1 +
 config/desktop.toml | 1 +
 config/jeremy.toml  | 1 +
 config/resist.toml  | 1 +
 config/rustc.toml   | 1 +
 config/server.toml  | 1 +
 cookbook            | 2 +-
 mk/filesystem.mk    | 3 +--
 8 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/acid.toml b/config/acid.toml
index 801135273..f97cbdbd6 100644
--- a/config/acid.toml
+++ b/config/acid.toml
@@ -7,6 +7,7 @@ prompt = false
 
 # Package settings
 [packages]
+bootloader = {}
 bootstrap = {}
 acid = {}
 coreutils = {}
diff --git a/config/desktop.toml b/config/desktop.toml
index 2cc812829..1067c3a23 100644
--- a/config/desktop.toml
+++ b/config/desktop.toml
@@ -8,6 +8,7 @@ prompt = false
 # Package settings
 [packages]
 audiod = {}
+bootloader = {}
 bootstrap = {}
 ca-certificates = {}
 contain = {}
diff --git a/config/jeremy.toml b/config/jeremy.toml
index 5f7cfb8fd..20739d759 100644
--- a/config/jeremy.toml
+++ b/config/jeremy.toml
@@ -8,6 +8,7 @@ prompt = false
 # Package settings
 [packages]
 audiod = {}
+bootloader = {}
 bootstrap = {}
 ca-certificates = {}
 contain = {}
diff --git a/config/resist.toml b/config/resist.toml
index af3ee9376..7f4779948 100644
--- a/config/resist.toml
+++ b/config/resist.toml
@@ -7,6 +7,7 @@ prompt = false
 
 # Package settings
 [packages]
+bootloader = {}
 bootstrap = {}
 coreutils = {}
 dash = {}
diff --git a/config/rustc.toml b/config/rustc.toml
index b19a99909..2c8d62b0b 100644
--- a/config/rustc.toml
+++ b/config/rustc.toml
@@ -7,6 +7,7 @@ prompt = false
 
 # Package settings
 [packages]
+bootloader = {}
 bootstrap = {}
 ca-certificates = {}
 contain = {}
diff --git a/config/server.toml b/config/server.toml
index 0950edfe4..a7bba5808 100644
--- a/config/server.toml
+++ b/config/server.toml
@@ -7,6 +7,7 @@ prompt = false
 
 # Package settings
 [packages]
+bootloader = {}
 bootstrap = {}
 ca-certificates = {}
 contain = {}
diff --git a/cookbook b/cookbook
index 3668ccc8a..71202ef03 160000
--- a/cookbook
+++ b/cookbook
@@ -1 +1 @@
-Subproject commit 3668ccc8ae7de773652f3a9348a9112ca5d89ea4
+Subproject commit 71202ef03ab5fc440c381d0a171c1d4e1097c4b2
diff --git a/mk/filesystem.mk b/mk/filesystem.mk
index db9becc0b..8b3e247b9 100644
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@@ -1,4 +1,4 @@
-build/filesystem.bin: prefix filesystem.toml build/bootloader.bin
+build/filesystem.bin: prefix filesystem.toml
 	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
 	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
 	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release
@@ -15,7 +15,6 @@ build/filesystem.bin: prefix filesystem.toml build/bootloader.bin
 	pgrep redoxfs
 	$(INSTALLER) -c filesystem.toml build/filesystem/
 	cp -v filesystem.toml build/filesystem/filesystem.toml
-	cp -v build/bootloader.bin build/filesystem/bootloader
 	mkdir -pv build/filesystem/pkg
 	cp -v cookbook/build/id_ed25519.pub.toml build/filesystem/pkg/id_ed25519.pub.toml
 	sync