Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a filesystem service #390

Merged
merged 20 commits into from
Aug 25, 2019
Merged

Add a filesystem service #390

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ca23cd8
Implement Filesystem
Jun 12, 2019
e299bbf
Add cat and /dev/urandom
Aug 21, 2019
a7812fa
Update libfat
Aug 21, 2019
be3a86c
Update libfat
Aug 22, 2019
3636c9d
Implement cd & pwd
Aug 22, 2019
c095c91
Update libfat
Aug 22, 2019
a981710
Apply suggestions from code review
Aug 22, 2019
51433d3
Some doc and logic fixes
Aug 23, 2019
952b8f0
Remove extraneous .gitignore in disk-initializer
Aug 23, 2019
a6eb800
Apply suggestions for disk-initializer & GPT
Aug 23, 2019
d89dad6
Document the archive bit
Aug 23, 2019
799716d
Simplity directory filter predicates
Aug 23, 2019
7f39c72
Fix a typo in StorageCachedBlockDevice
Aug 23, 2019
2156c8c
Specify that you can only read from one block in read_from_temp_storage
Aug 23, 2019
0584956
Update libfat and show block_device field in StorageBlockDevice Debug…
Aug 23, 2019
7a8f2ab
reduce path to 0x300 and simplify directory reading logic
Aug 23, 2019
133849b
Remove interface::IFileSystem
Aug 23, 2019
f17032b
Add tests for convert_path
Aug 23, 2019
1da04f6
simplify Directory filtering
Aug 23, 2019
f9ff277
Clean up and switch to SunriseOS's libfat
Aug 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 94 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = ["kernel", "bootstrap", "shell", "time", "libuser", "wall-clock", "sm", "vi", "ahci", "libutils", "libkern", "swipc-gen", "swipc-parser", "docs", "libtimezone"]
members = ["kernel", "bootstrap", "shell", "time", "libuser", "wall-clock", "sm", "vi", "ahci", "fs", "libutils", "libkern", "swipc-gen", "swipc-parser", "docs", "libtimezone", "disk-initializer"]

[profile.release]
debug = true
Expand Down
37 changes: 24 additions & 13 deletions Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,29 @@ dependencies = ["install-rust-src"]
command = "cargo"
args = ["xbuild", "--target=i386-unknown-none-user", "--package=sunrise-time", "--release"]

[tasks.fs]
workspace = false
description = "Compiles sunrise-fs"
dependencies = ["install-rust-src"]
command = "cargo"
args = ["xbuild", "--target=i386-unknown-none-user", "--package=sunrise-fs"]

[tasks.fs-release]
workspace = false
description = "Compiles sunrise-fs"
dependencies = ["install-rust-src"]
command = "cargo"
args = ["xbuild", "--target=i386-unknown-none-user", "--package=sunrise-fs", "--release"]

[tasks.userspace]
workspace = false
description = "Compiles userspace apps"
dependencies = ["shell", "wall-clock", "sm", "vi", "ahci", "time"]
dependencies = ["shell", "wall-clock", "sm", "vi", "ahci", "time", "fs"]

[tasks.userspace-release]
workspace = false
description = "Compiles userspace apps"
dependencies = ["shell-release", "wall-clock-release", "sm-release", "vi-release", "ahci-release", "time-release"]
dependencies = ["shell-release", "wall-clock-release", "sm-release", "vi-release", "ahci-release", "time-release", "fs-release"]

[tasks.iso]
workspace = false
Expand All @@ -177,6 +191,7 @@ cp target/i386-unknown-none-user/debug/sunrise-wall-clock isofiles/boot/
cp target/i386-unknown-none-user/debug/sunrise-sm isofiles/boot/
cp target/i386-unknown-none-user/debug/sunrise-vi isofiles/boot/
cp target/i386-unknown-none-user/debug/sunrise-ahci isofiles/boot/
cp target/i386-unknown-none-user/debug/sunrise-fs isofiles/boot/
mkisofs-rs external/grub/isofiles isofiles -o os.iso -b boot/grub/i386-pc/eltorito.img --no-emul-boot --boot-info-table --embedded-boot external/grub/embedded.img
'''
]
Expand All @@ -196,23 +211,16 @@ cp target/i386-unknown-none-user/release/sunrise-wall-clock isofiles/boot/
cp target/i386-unknown-none-user/release/sunrise-sm isofiles/boot/
cp target/i386-unknown-none-user/release/sunrise-vi isofiles/boot/
cp target/i386-unknown-none-user/release/sunrise-ahci isofiles/boot/
cp target/i386-unknown-none-user/release/sunrise-fs isofiles/boot/
mkisofs-rs external/grub/isofiles isofiles -o os.iso -b boot/grub/i386-pc/eltorito.img --no-emul-boot --boot-info-table --embedded-boot external/grub/embedded.img
'''
]

[tasks.disk]
workspace = false
description = "Creates an empty disk image."
command = "dd"
# 16384 = 8MiB / 512
# 512 is the block size, 8MiB is the target disk size.
args = [ "if=/dev/zero", "of=DISK.img", "count=16384", "bs=512" ]

[tasks.disk.windows]
command = "fsutil"
# Chosen by fair dice roll.
# 8388608 = 8MiB in bytes
args = [ "file", "createnew", "DISK.img", "8388608" ]
command = "cargo"
args = ["run", "--manifest-path", "disk-initializer/Cargo.toml", "--", "DISK.img", "52428800", "external/filesystem/disk_template/"]

# because we can't have a dependency on a file ರ_ರ
[tasks.create-disk-if-not-exist]
Expand All @@ -230,6 +238,7 @@ description = "Runs the bootable ISO in qemu."
dependencies = ["iso-release", "create-disk-if-not-exist"]
command = "qemu-system-i386"
args = [
"-boot", "d",
marysaka marked this conversation as resolved.
Show resolved Hide resolved
"-cdrom", "os.iso",
"-serial", "stdio",
"-vnc", "${VNC_PORT}",
Expand All @@ -245,6 +254,7 @@ description = "Runs the bootable ISO in qemu with gdb support"
dependencies = ["iso", "create-disk-if-not-exist"]
command = "qemu-system-i386"
args = [
"-boot", "d",
"-cdrom", "os.iso",
"-serial", "stdio",
"-vnc", "${VNC_PORT}",
Expand Down Expand Up @@ -315,6 +325,7 @@ install_crate = { rustup_component_name = "clippy" }
command = "cargo"
args = ["xclippy", "--target=i386-unknown-none",
"--all", "--exclude", "swipc-gen", "--exclude", "swipc-parser",
"--exclude", "disk-initializer",
"--exclude", "docs",
"--",
"@@split(CLIPPY_RULES, )",
Expand All @@ -328,7 +339,7 @@ dependencies = ["install-rust-src", "refresh-crates"]
install_crate = { rustup_component_name = "clippy" }
command = "cargo"
args = ["clippy",
"-p", "swipc-gen", "-p", "swipc-parser", "-p", "docs",
"-p", "swipc-gen", "-p", "swipc-parser", "-p", "docs", "-p", "disk-initializer",
"--",
"@@split(CLIPPY_RULES, )",
"${@}",
Expand Down
Loading