Merge branch 'move_initfs_to_recipe' into 'master'

Move initfs.mk to a regular cookbook recipe.

See merge request redox-os/redox!1272

Makefile

@@ -32,7 +32,6 @@ pull:
 
 update:
 	cd cookbook && ./update.sh \
-		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \
 		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
 	cargo update --manifest-path cookbook/pkgutils/Cargo.toml
 	cargo update --manifest-path installer/Cargo.toml
@@ -42,7 +41,6 @@ update:
 fetch:
 	cargo build --manifest-path cookbook/Cargo.toml --release
 	cd cookbook && ./fetch.sh \
-		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \
 		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
 
 # Cross compiler recipes
@@ -52,7 +50,6 @@ include mk/prefix.mk
 include mk/bootloader.mk
 
 # Filesystem recipes
-include mk/initfs.mk
 include mk/filesystem.mk
 
 # Disk images

config/desktop.toml

@@ -20,6 +20,7 @@ extrautils = {}
 findutils = {}
 gdbserver = {}
 gnu-make = {}
+initfs = {}
 installer = {}
 ion = {}
 ipcd = {}

cookbook

@@ -1 +1 @@
-Subproject commit fb22428bb1d1bc586c1058fe4787ac2a48ea329a
+Subproject commit dd942939275a3b57f8c76db3c616f1511215a9ea

initfs.toml

@@ -1,39 +0,0 @@
-# This is the default configuration file
-
-# General settings
-[general]
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-drivers-initfs = {}
-init = {}
-logd = {}
-nulld = {}
-#pciids = {}
-ramfs = {}
-randd = {}
-redoxfs = {}
-zerod = {}
-
-[[files]]
-path="/etc/init.rc"
-data="""
-export PATH /bin
-export TMPDIR /tmp
-nulld
-zerod
-randd
-vesad T T G
-logd debug: display:1
-stdio log:
-ps2d us
-ramfs logging
-acpid
-pcid /etc/pcid/initfs.toml
-redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
-cd file:
-export PATH file:/bin
-run.d /etc/init.d
-"""

mk/filesystem.mk

@@ -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/

mk/initfs.mk

@@ -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 $@

redox-initfs

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