installer

@@ -1 +1 @@
-Subproject commit f8ec4d28bc9e3a9aa6321058cede9bb97856305a
+Subproject commit 9ea9a6ecac7f20bde8ff4dfa100d046e42bce49b

mk/filesystem.mk

@@ -1,10 +1,10 @@
-build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix
+build/filesystem.bin: filesystem.toml build/kernel prefix
 	cargo build --manifest-path cookbook/Cargo.toml --release
 	cargo build --manifest-path installer/Cargo.toml --release
 	cargo build --manifest-path redoxfs/Cargo.toml --release
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf $@  $@.partial build/filesystem/
-	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
+	dd if=/dev/zero of=$@.partial bs=1048576 count="$(FILESYSTEM_SIZE)"
 	cargo run --release \
 		--manifest-path redoxfs/Cargo.toml \
 		--bin redoxfs-mkfs \
@@ -13,13 +13,10 @@ 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 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
+	cp $< build/filesystem/filesystem.toml
+	cp build/kernel build/filesystem/kernel
+	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
+	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
 	$(INSTALLER) -c $< build/filesystem/
 	sync
 	-$(FUMOUNT) build/filesystem/ || true

mk/initfs.mk

@@ -22,7 +22,6 @@ build/initfs.tag: initfs.toml prefix
 	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

relibc

@@ -1 +1 @@
-Subproject commit ec0047c864bfff5affc92650349d6125312280f4
+Subproject commit f63d9cefadd6d53488f457f9e40de8872ddb7734