Update installer

Add files needed for installation to filesystem, do not copy dynamic linking files
Remove pkg directory from initfs
2022-03-23 15:07:01 -06:00 · 2022-03-23 13:54:48 -06:00 · 2022-03-23 13:53:35 -06:00 · 2022-03-23 13:48:30 -06:00
4 changed files with 12 additions and 8 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9ea9a6ecac7f20bde8ff4dfa100d046e42bce49b
+Subproject commit f8ec4d28bc9e3a9aa6321058cede9bb97856305a
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@ -1,10 +1,10 @@
-build/filesystem.bin: filesystem.toml build/kernel prefix
+build/filesystem.bin: filesystem.toml build/bootloader.bin 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/
-	dd if=/dev/zero of=$@.partial bs=1048576 count="$(FILESYSTEM_SIZE)"
+	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
 	cargo run --release \
 		--manifest-path redoxfs/Cargo.toml \
 		--bin redoxfs-mkfs \
@ -13,10 +13,13 @@ build/filesystem.bin: filesystem.toml build/kernel prefix
 	redoxfs/target/release/redoxfs $@.partial build/filesystem/
 	sleep 2
 	pgrep redoxfs
-	cp $< build/filesystem/filesystem.toml
+	cp -v $< build/filesystem/filesystem.toml
-	cp build/kernel build/filesystem/kernel
+	cp -v build/bootloader.bin build/filesystem/bootloader
-	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
+	cp -v build/kernel build/filesystem/kernel
-	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
+	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/
 	sync
 	-$(FUMOUNT) build/filesystem/ || true
--- a/mk/initfs.mk
+++ b/mk/initfs.mk
@ -22,6 +22,7 @@ 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
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f63d9cefadd6d53488f457f9e40de8872ddb7734
+Subproject commit ec0047c864bfff5affc92650349d6125312280f4
Author	SHA1	Message	Date
Jeremy Soller	cc7f50e139	Update installer	2022-03-23 15:07:01 -06:00
Jeremy Soller	7ac5196528	Add files needed for installation to filesystem, do not copy dynamic linking files	2022-03-23 13:54:48 -06:00
Jeremy Soller	1f6e1c9676	Remove pkg directory from initfs	2022-03-23 13:53:35 -06:00
Jeremy Soller	5ac424f5cb	Update relibc	2022-03-23 13:48:30 -06:00
		`@ -1 +1 @@`
			`Subproject commit 9ea9a6ecac7f20bde8ff4dfa100d046e42bce49b`				`Subproject commit f8ec4d28bc9e3a9aa6321058cede9bb97856305a`
		`@ -1 +1 @@`
			`Subproject commit f63d9cefadd6d53488f457f9e40de8872ddb7734`				`Subproject commit ec0047c864bfff5affc92650349d6125312280f4`