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

Move initfs.mk to a regular cookbook recipe.

Browse source
This commit is contained in:
4lDO2 2022-08-10 12:14:34 +02:00
parent 63605d1e80
commit ce83e7b46d
No known key found for this signature in database
GPG key ID: 996A1DBA676A00C0
7 changed files with 3 additions and 62 deletions
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: prefix filesystem.toml build/bootloader.bin build/initfs.img
build/filesystem.bin: prefix filesystem.toml build/bootloader.bin
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release
@ -20,7 +20,6 @@ build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/initfs.i
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
$(INSTALLER) -c filesystem.toml build/filesystem/
cp build/initfs.img build/filesystem/initfs
sync
-$(FUMOUNT) build/filesystem/ || true
rm -rf build/filesystem/

16
mk/initfs.mk
View file

@ -1,16 +0,0 @@
INITFS_RM_BINS=\
redoxfs-ar \
redoxfs-mkfs
build/initfs.img: initfs.toml prefix
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
rm -rf build/initfs
mkdir -p build/initfs
$(INSTALLER) -c $< build/initfs/
#TODO: HACK FOR SMALLER INITFS, FIX IN PACKAGING
rm -rf build/initfs/pkg
for bin in $(INITFS_RM_BINS); do \
rm -f build/initfs/bin/$$bin; \
done
cargo run --manifest-path redox-initfs/tools/Cargo.toml --bin redox-initfs-ar -- build/initfs -o $@