From 672f8b82973e28489a330c028d204951b8157a9d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 19 Jun 2017 20:15:56 -0600 Subject: [PATCH] Upgrade cookbook, revert Rust, clean cookbook in make clean, put xargo build in subfolder --- Makefile | 1 + cookbook | 2 +- mk/config.mk | 1 + rust | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1306e77..7c3d6f1 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,7 @@ live: build/livedisk.bin iso: build/livedisk.iso clean: + cd cookbook && ./clean.sh cargo clean --manifest-path cookbook/pkgutils/Cargo.toml cargo clean --manifest-path installer/Cargo.toml cargo clean --manifest-path installer/redoxfs/Cargo.toml diff --git a/cookbook b/cookbook index 8da4935..ae09d5a 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 8da49359fe6402c24446c9b8042530dfccde28d3 +Subproject commit ae09d5afbcf8b875f4bce30ffe9de70286832efb diff --git a/mk/config.mk b/mk/config.mk index db36a11..43bdf72 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -25,6 +25,7 @@ endif ROOT=$(PWD) export INITFS_FOLDER=$(ROOT)/build/initfs export RUST_TARGET_PATH=$(ROOT)/kernel/targets +export XARGO_HOME=$(ROOT)/build/xargo export XARGO_RUST_SRC=$(ROOT)/rust/src # Kernel variables diff --git a/rust b/rust index 247a018..4bf5c99 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 247a0184ff972f1205017185f6917a03b15e7be4 +Subproject commit 4bf5c99afc75f411a4e064150781eefc749c10df