From 0b5de37c1c8cebfd916498245ae9466f00c67d0a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 25 May 2020 21:53:12 -0600 Subject: [PATCH] Update cookbook and build cookbook binary --- cookbook | 2 +- mk/filesystem.mk | 1 + mk/initfs.mk | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cookbook b/cookbook index d460861..c1676c3 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit d4608615ed3220709dc8d760a9d18c62250478fb +Subproject commit c1676c3856e134dbe63a10cf6f7c76245868b790 diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 2641376..e048bad 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -1,4 +1,5 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix + cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path redoxfs/Cargo.toml --release -$(FUMOUNT) build/filesystem/ || true diff --git a/mk/initfs.mk b/mk/initfs.mk index 8e9b4fd..ad5c7a2 100644 --- a/mk/initfs.mk +++ b/mk/initfs.mk @@ -1,4 +1,5 @@ build/initfs.tag: initfs.toml prefix + cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release rm -f build/libkernel.a rm -rf build/initfs @@ -7,6 +8,7 @@ build/initfs.tag: initfs.toml prefix touch $@ build/initfs_coreboot.tag: initfs_coreboot.toml prefix + cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release rm -f build/libkernel_coreboot.a rm -rf build/initfs_coreboot @@ -15,6 +17,7 @@ build/initfs_coreboot.tag: initfs_coreboot.toml prefix touch $@ build/initfs_live.tag: initfs_live.toml prefix + cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release rm -f build/libkernel_live.a rm -rf build/initfs_live