vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix detection of initfs changes

Browse source
This commit is contained in:
Jeremy Soller 2017-03-19 16:46:15 -06:00
parent f37f4bb4fd
commit dea4ec0953
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mk/initfs.mk
View file

@ -1,13 +1,15 @@
$(BUILD)/initfs.rs: \ $(KBUILD)/initfs.tag: initfs/bin/init \
initfs/bin/init \
initfs/bin/ahcid \ initfs/bin/ahcid \
initfs/bin/bgad \ initfs/bin/bgad \
initfs/bin/nvmed \ initfs/bin/nvmed \
initfs/bin/pcid \ initfs/bin/pcid \
initfs/bin/ps2d \ initfs/bin/ps2d \
initfs/bin/redoxfs \ initfs/bin/redoxfs \
initfs/bin/vboxd \
initfs/bin/vesad \ initfs/bin/vesad \
initfs/etc/** initfs/etc/**
$(KCARGO) clean --manifest-path kernel/Cargo.toml
touch $@
initfs/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib initfs/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
mkdir -p initfs/bin mkdir -p initfs/bin

4
mk/kernel.mk
View file

@ -3,10 +3,10 @@ $(KBUILD)/libcollections.rlib: rust/src/libcollections/Cargo.toml rust/src/libco
$(KCARGO) rustc --manifest-path $< $(KCARGOFLAGS) -o $@ $(KCARGO) rustc --manifest-path $< $(KCARGOFLAGS) -o $@
cp rust/src/target/$(KTARGET)/release/deps/*.rlib $(KBUILD) 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 $@ $(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 $@ $(KCARGO) rustc --manifest-path $< --lib --features live $(KCARGOFLAGS) -o $@
$(KBUILD)/kernel: $(KBUILD)/libkernel.a $(KBUILD)/kernel: $(KBUILD)/libkernel.a