Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: dtolnay/rust-toolchain@stable
- run: cargo install cargo-cargofmt
- uses: actions/checkout@v6
- uses: mkroening/rust-toolchain-toml@main
- run: rustup component add rustfmt
- run: |
cargo fmt --all --check
cargo fmt --all --check --manifest-path hermit-builtins/Cargo.toml
cargo cargofmt --all --check
cargo cargofmt --all --check --manifest-path hermit-builtins/Cargo.toml

lock-file:
name: Lock file
Expand Down
26 changes: 13 additions & 13 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,12 @@ tcp = ["net", "smoltcp", "smoltcp/socket-tcp"]
udp = ["net", "smoltcp", "smoltcp/socket-udp"]

## Enables DHCPv4 support.
dhcpv4 = ["net", "smoltcp", "smoltcp/proto-dhcpv4", "smoltcp/socket-dhcpv4"]
dhcpv4 = [
"net",
"smoltcp",
"smoltcp/proto-dhcpv4",
"smoltcp/socket-dhcpv4",
]

## Enables DNS support.
dns = ["net", "smoltcp", "smoltcp/socket-dns"]
Expand Down Expand Up @@ -280,7 +285,7 @@ vsock = ["virtio-vsock"]

[lints.rust]
rust_2018_idioms = "warn"
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(careful)'] }
unexpected_cfgs = { level = "warn", check-cfg = ["cfg(careful)"] }
unsafe_op_in_unsafe_fn = "warn"

[lints.clippy]
Expand Down Expand Up @@ -369,8 +374,8 @@ raw-cpuid = "11"
uart_16550 = "0.4"
x86_64 = "0.15"
memory_addresses = { version = "0.3", default-features = false, features = [
"x86_64",
"conv-x86_64",
"x86_64",
"conv-x86_64",
] }

[target.'cfg(target_arch = "aarch64")'.dependencies]
Expand All @@ -379,7 +384,7 @@ arm-gic = { version = "0.6" }
arm-pl011-uart = { version = "0.4", default-features = false }
semihosting = { version = "0.1", optional = true }
memory_addresses = { version = "0.3", default-features = false, features = [
"aarch64",
"aarch64",
] }

[target.'cfg(target_arch = "riscv64")'.dependencies]
Expand All @@ -389,7 +394,7 @@ semihosting = { version = "0.1", optional = true }
tock-registers = { version = "0.10", optional = true }
trapframe = "0.10"
memory_addresses = { version = "0.3", default-features = false, features = [
"riscv64",
"riscv64",
] }

[dev-dependencies]
Expand All @@ -402,13 +407,8 @@ built = { version = "0.8", features = ["git2", "chrono"] }
llvm-tools = "0.1"

[workspace]
members = [
"hermit-macro",
"xtask",
]
exclude = [
"hermit-builtins",
]
members = ["hermit-macro", "xtask"]
exclude = ["hermit-builtins"]

[patch.crates-io]
safe-mmio = { git = "https://github.com/hermit-os/safe-mmio", branch = "be" }
Expand Down
4 changes: 3 additions & 1 deletion hermit-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[package]
name = "hermit-macro"
version = "0.1.0"
authors = ["Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>"]
authors = [
"Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>",
]
edition = "2024"
description = "Proc macro implementation to defined system calls"
repository = "https://github.com/hermit-os/kernel"
Expand Down
9 changes: 8 additions & 1 deletion xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ edition = "2024"

[features]
default = ["ci"]
ci = ["dep:libc", "dep:ovmf-prebuilt", "dep:sysinfo", "dep:ureq", "dep:vsock", "dep:wait-timeout"]
ci = [
"dep:libc",
"dep:ovmf-prebuilt",
"dep:sysinfo",
"dep:ureq",
"dep:vsock",
"dep:wait-timeout",
]

[dependencies]
anyhow = "1.0"
Expand Down
Loading