Compare commits

..

14 Commits

Author SHA1 Message Date
Jeremy Soller
b1a982c6f0
Update submodules 2022-03-11 09:18:16 -07:00
Jeremy Soller
e844d3edab
Allow redoxfs mkfs flags to be set 2022-03-09 10:50:02 -07:00
Jeremy Soller
fd4b3e7a52
Update kernel 2022-03-09 10:32:09 -07:00
Jeremy Soller
bea8fe9134
Update bootloader and kernel 2022-03-02 19:22:40 -07:00
Jeremy Soller
d21c4cd8af
Update bootloader and kernel 2022-03-01 19:45:16 -07:00
Jeremy Soller
28299d61fe
Update kernel 2022-03-01 16:25:24 -07:00
Jeremy Soller
5f6e301efb
Update bootloader and kernel 2022-03-01 12:55:21 -07:00
Jeremy Soller
f1b6e4afbf
Update bootloader 2022-03-01 07:58:56 -07:00
Jeremy Soller
e779848fdd
Adjust initfs removed binaries, copy bootloader to filesystem 2022-02-28 17:38:21 -07:00
Jeremy Soller
ca0792a390
Update cookbook and installer 2022-02-28 12:26:37 -07:00
Jeremy Soller
afed6a7190
Update bootloader and redoxfs 2022-02-27 20:59:32 -07:00
Jeremy Soller
edcadf4079
Update redoxfs 2022-02-27 20:27:01 -07:00
Jeremy Soller
17516fc24a
Update bootloader and redoxfs 2022-02-27 20:12:17 -07:00
Jeremy Soller
42c5462f30
Use redoxfs 0.5.0 branch 2022-02-22 10:41:31 -07:00
7 changed files with 25 additions and 6 deletions

@ -1 +1 @@
Subproject commit e02f110fc9f03f79a1db62faf9baef9e9b7a1e05
Subproject commit 3ae8f93f8dea1ee84b9bb583d1795edd0bd44eec

@ -1 +1 @@
Subproject commit 84856f459dccbc86a6490904e571389de72bf4c4
Subproject commit b35e1321538dbefa3985ff23cc8dcbb818a5e1b1

2
kernel

@ -1 +1 @@
Subproject commit 81e700708d901d6552c2cef242df505d93efbf4f
Subproject commit 80376a95dc784966260992910d7e789390f58b65

View File

@ -9,6 +9,8 @@ INSTALLER_FLAGS?=--cookbook=cookbook
PREFIX_BINARY?=1
## Filesystem size in MB (256 is the default)
FILESYSTEM_SIZE?=256
## Flags to pass to redoxfs-mkfs. Add --encrypt to set up disk encryption
REDOXFS_MKFS_FLAGS?=
# Per host variables
UNAME := $(shell uname)

View File

@ -5,7 +5,10 @@ build/filesystem.bin: filesystem.toml build/kernel prefix
-$(FUMOUNT) build/filesystem/ || true
rm -rf $@ $@.partial build/filesystem/
dd if=/dev/zero of=$@.partial bs=1048576 count="$(FILESYSTEM_SIZE)"
cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-mkfs $@.partial
cargo run --release \
--manifest-path redoxfs/Cargo.toml \
--bin redoxfs-mkfs \
-- $(REDOXFS_MKFS_FLAGS) $@.partial
mkdir -p build/filesystem/
redoxfs/target/release/redoxfs $@.partial build/filesystem/
sleep 2

View File

@ -1,4 +1,18 @@
INITFS_RM_BINS=alxd e1000d ihdad ixgbed pcspkrd redoxfs-ar redoxfs-mkfs rtl8168d usbctl
INITFS_RM_BINS=\
alxd \
bgad \
e1000d \
ihdad \
ixgbed \
pcspkrd \
redoxfs-ar \
redoxfs-mkfs \
rtl8168d \
usbctl \
usbhidd \
usbscsid \
vboxd \
xhcid
build/initfs.tag: initfs.toml prefix
cargo build --manifest-path cookbook/Cargo.toml --release

@ -1 +1 @@
Subproject commit cfe5841646df0044e9e689a43b97c9aff3a65444
Subproject commit f9f4f7c5f01f61c02b95c0cb9f00b3ce9271aaed