Merge branch '4lDO2/redox-external-initfs'

.gitmodules

@@ -34,3 +34,6 @@
 	path = bootloader-coreboot
 	url = https://gitlab.redox-os.org/redox-os/bootloader-coreboot.git
 	branch = master
+[submodule "redox-initfs"]
+	path = redox-initfs
+	url = https://gitlab.redox-os.org/redox-os/redox-initfs.git

bootloader

@@ -1 +1 @@
-Subproject commit 2f86d3a70e406a5b19fb2686da82b0bc2c81db35
+Subproject commit ec14ff801c89954196a9d86e4d13176eeb84ab9e

kernel

@@ -1 +1 @@
-Subproject commit 87b3bef06c13847a971aefd811a46dffa89adf46
+Subproject commit 8f06672153c17fc6b7f9ed5d57a220164360b7e2

mk/filesystem.mk

@@ -1,4 +1,4 @@
-build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix
+build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/kernel build/initfs.img
 	cargo build --manifest-path cookbook/Cargo.toml --release
 	cargo build --manifest-path installer/Cargo.toml --release
 	cargo build --manifest-path redoxfs/Cargo.toml --release
@@ -13,14 +13,15 @@ build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix
 	redoxfs/target/release/redoxfs $@.partial build/filesystem/
 	sleep 2
 	pgrep redoxfs
-	cp -v $< build/filesystem/filesystem.toml
+	cp -v filesystem.toml build/filesystem/filesystem.toml
 	cp -v build/bootloader.bin build/filesystem/bootloader
 	cp -v build/kernel build/filesystem/kernel
 	mkdir -v build/filesystem/pkg
 	cp -v cookbook/build/id_ed25519.pub.toml build/filesystem/pkg/id_ed25519.pub.toml
 	#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
 	#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
-	$(INSTALLER) -c $< build/filesystem/
+	$(INSTALLER) -c filesystem.toml build/filesystem/
+	cp build/initfs.img build/filesystem/initfs
 	sync
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf build/filesystem/

mk/initfs.mk

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

mk/kernel.mk

@@ -1,11 +1,10 @@
-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 INITFS_FOLDER=$(ROOT)/build/initfs && \
 	cd kernel && \
 	cargo rustc --lib --target=$(ROOT)/kernel/targets/$(KTARGET).json --release -- -C soft-float -C debuginfo=2 -C lto --emit link=../$@
 
 build/kernel: kernel/linkers/$(ARCH).ld mk/kernel_ld.sh build/libkernel.a
 	export PATH="$(PREFIX_PATH):$$PATH" && \
-	$(ROOT)/mk/kernel_ld.sh $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel.a && \
-	$(OBJCOPY) --only-keep-debug $@ $@.sym && \
-	$(OBJCOPY) --strip-debug $@
+	$(ROOT)/mk/kernel_ld.sh $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@.all build/libkernel.a && \
+	$(OBJCOPY) --only-keep-debug $@.all $@.sym && \
+	$(OBJCOPY) --strip-debug $@.all $@

redox-initfs

@@ -0,0 +1 @@
+Subproject commit 89b8fb8984cf96c418880b7dcd9ce3d6afc3f71c