Compare commits

..

No commits in common. "b1a982c6f0bcbf9d77cc8c181fd0646c3b47a896" and "1d3202a70f6017b8ce1494f8383a1246f1479882" have entirely different histories.

7 changed files with 6 additions and 25 deletions

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

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

2
kernel

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

View File

@ -9,8 +9,6 @@ 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,10 +5,7 @@ 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 --release \
--manifest-path redoxfs/Cargo.toml \
--bin redoxfs-mkfs \
-- $(REDOXFS_MKFS_FLAGS) $@.partial
cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-mkfs $@.partial
mkdir -p build/filesystem/
redoxfs/target/release/redoxfs $@.partial build/filesystem/
sleep 2

View File

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

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