diff --git a/mk/initfs.mk b/mk/initfs.mk index df57df4..c6b9500 100644 --- a/mk/initfs.mk +++ b/mk/initfs.mk @@ -1,13 +1,15 @@ -$(BUILD)/initfs.rs: \ - initfs/bin/init \ - initfs/bin/ahcid \ - initfs/bin/bgad \ - initfs/bin/nvmed \ - initfs/bin/pcid \ - initfs/bin/ps2d \ - initfs/bin/redoxfs \ - initfs/bin/vesad \ - initfs/etc/** +$(KBUILD)/initfs.tag: initfs/bin/init \ + initfs/bin/ahcid \ + initfs/bin/bgad \ + initfs/bin/nvmed \ + initfs/bin/pcid \ + initfs/bin/ps2d \ + initfs/bin/redoxfs \ + initfs/bin/vboxd \ + initfs/bin/vesad \ + initfs/etc/** + $(KCARGO) clean --manifest-path kernel/Cargo.toml + touch $@ initfs/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib mkdir -p initfs/bin diff --git a/mk/kernel.mk b/mk/kernel.mk index 9760d0d..b4370b2 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -3,10 +3,10 @@ $(KBUILD)/libcollections.rlib: rust/src/libcollections/Cargo.toml rust/src/libco $(KCARGO) rustc --manifest-path $< $(KCARGOFLAGS) -o $@ cp rust/src/target/$(KTARGET)/release/deps/*.rlib $(KBUILD) -$(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs +$(KBUILD)/libkernel.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(KBUILD)/initfs.tag $(KCARGO) rustc --manifest-path $< --lib $(KCARGOFLAGS) -o $@ -$(KBUILD)/libkernel_live.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(BUILD)/initfs.rs build/filesystem.bin +$(KBUILD)/libkernel_live.a: kernel/Cargo.toml kernel/arch/** kernel/src/** $(KBUILD)/libcollections.rlib $(KBUILD)/initfs.tag build/filesystem.bin $(KCARGO) rustc --manifest-path $< --lib --features live $(KCARGOFLAGS) -o $@ $(KBUILD)/kernel: $(KBUILD)/libkernel.a