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

Do not rebuild kernel when initfs changes

Browse source
This commit is contained in:
4lDO2 2022-03-26 20:47:49 +01:00
parent 0d6020bab9
commit 6df94dde59
No known key found for this signature in database
GPG key ID: 32115F2918040783
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mk/filesystem.mk
View file

@ -1,4 +1,4 @@
build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix build/initfs.img
cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path cookbook/Cargo.toml --release
cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release
cargo build --manifest-path redoxfs/Cargo.toml --release cargo build --manifest-path redoxfs/Cargo.toml --release
@ -21,6 +21,7 @@ build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include #TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib #TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
$(INSTALLER) -c $< build/filesystem/ $(INSTALLER) -c $< build/filesystem/
cp build/initfs.img build/filesystem/initfs
sync sync
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf build/filesystem/ rm -rf build/filesystem/

5
mk/initfs.mk
View file

@ -14,10 +14,9 @@ INITFS_RM_BINS=\
vboxd \ vboxd \
xhcid xhcid
build/initfs.tag: initfs.toml prefix build/initfs.img: initfs.toml prefix
cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path cookbook/Cargo.toml --release
cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release
rm -f build/libkernel.a
rm -rf build/initfs rm -rf build/initfs
mkdir -p build/initfs mkdir -p build/initfs
$(INSTALLER) -c $< build/initfs/ $(INSTALLER) -c $< build/initfs/
@ -26,4 +25,4 @@ build/initfs.tag: initfs.toml prefix
for bin in $(INITFS_RM_BINS); do \ for bin in $(INITFS_RM_BINS); do \
rm -f build/initfs/bin/$$bin; \ rm -f build/initfs/bin/$$bin; \
done done
touch $@ cargo run --manifest-path redox-initfs/tools/Cargo.toml --bin redox-initfs-ar -- build/initfs -o $@

3
mk/kernel.mk
View file

@ -1,6 +1,5 @@
build/libkernel.a: kernel/Cargo.lock kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* kernel/src/*/*/*/* build/initfs.tag build/libkernel.a: kernel/Cargo.lock kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* kernel/src/*/*/*/*
export PATH="$(PREFIX_PATH):$$PATH" && \ export PATH="$(PREFIX_PATH):$$PATH" && \
export INITFS_FOLDER=$(ROOT)/build/initfs && \
cd kernel && \ cd kernel && \
cargo rustc --lib --target=$(ROOT)/kernel/targets/$(KTARGET).json --release -- -C soft-float -C debuginfo=2 -C lto --emit link=../$@ cargo rustc --lib --target=$(ROOT)/kernel/targets/$(KTARGET).json --release -- -C soft-float -C debuginfo=2 -C lto --emit link=../$@