Merge pull request #458 from hermitcore/rename-hermit-sys

feat: rename hermit-sys to hermit
hermit-os · Aug 25, 2023 · 17eae62 · 17eae62
2 parents df122c8 + e24963f
commit 17eae62
Show file tree

Hide file tree

Showing 28 changed files with 94 additions and 94 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 resolver = "2"
 members = [
     "hermit-abi",
-    "hermit-sys",
+    "hermit",
     "benches/alloc",
     "benches/netbench",
     "benches/micro",

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ The repository contains following directories and submodules:
 
 1. _demo_ is a small demo application based on the data-parallelism library [Rayon](https://github.com/rayon-rs/rayon)
 2. _hermit-abi_ contains the platform APIs and builds the interface between library operating system and the application
-3. _hermit-sys_ contains a crate to automate the build process of the library operating systems
+3. _hermit_ contains a crate to automate the build process of the library operating systems
 4. _kernel_ is the kernel itself
 5. _netbench_ provides some basic network benchmarks
 

diff --git a/benches/alloc/Cargo.toml b/benches/alloc/Cargo.toml
@@ -8,16 +8,16 @@ publish = false
 [dependencies]
 fastrand = "2.0.0"
 
-[target.'cfg(target_os = "hermit")'.dependencies.hermit-sys]
-path = "../../hermit-sys"
+[target.'cfg(target_os = "hermit")'.dependencies.hermit]
+path = "../../hermit"
 default-features = false
 
 [features]
 default = ["pci", "acpi"]
-vga = ["hermit-sys/vga"]
-pci = ["hermit-sys/pci"]
-pci-ids = ["hermit-sys/pci-ids"]
-acpi = ["hermit-sys/acpi"]
-fsgsbase = ["hermit-sys/fsgsbase"]
-smp = ["hermit-sys/smp"]
-instrument = ["hermit-sys/instrument"]
+vga = ["hermit/vga"]
+pci = ["hermit/pci"]
+pci-ids = ["hermit/pci-ids"]
+acpi = ["hermit/acpi"]
+fsgsbase = ["hermit/fsgsbase"]
+smp = ["hermit/smp"]
+instrument = ["hermit/instrument"]
diff --git a/benches/alloc/src/main.rs b/benches/alloc/src/main.rs
@@ -32,7 +32,7 @@ SOFTWARE.
 #![feature(slice_ptr_get)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 use std::alloc::{alloc, dealloc, Layout};
 use std::time::Instant;

diff --git a/benches/micro/Cargo.toml b/benches/micro/Cargo.toml
@@ -8,8 +8,8 @@ publish = false
 [dependencies]
 rayon = "1.5"
 
-[target.'cfg(target_os = "hermit")'.dependencies.hermit-sys]
-path = "../../hermit-sys"
+[target.'cfg(target_os = "hermit")'.dependencies.hermit]
+path = "../../hermit"
 default-features = false
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
@@ -21,10 +21,10 @@ syscalls = { version = "0.6", default-features = false }
 
 [features]
 default = ["pci", "acpi", "smp"]
-vga = ["hermit-sys/vga"]
-pci = ["hermit-sys/pci"]
-pci-ids = ["hermit-sys/pci-ids"]
-acpi = ["hermit-sys/acpi"]
-fsgsbase = ["hermit-sys/fsgsbase"]
-smp = ["hermit-sys/smp"]
-instrument = ["hermit-sys/instrument"]
+vga = ["hermit/vga"]
+pci = ["hermit/pci"]
+pci-ids = ["hermit/pci-ids"]
+acpi = ["hermit/acpi"]
+fsgsbase = ["hermit/fsgsbase"]
+smp = ["hermit/smp"]
+instrument = ["hermit/instrument"]
diff --git a/benches/micro/src/main.rs b/benches/micro/src/main.rs
@@ -3,7 +3,7 @@
 #![feature(test)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 mod benches;
 

diff --git a/benches/netbench/Cargo.toml b/benches/netbench/Cargo.toml
@@ -14,22 +14,22 @@ clap = {version ="4.1", features = ["derive"] }
 core_affinity = "0.8"
 hdrhist = "0.5"
 
-[target.'cfg(target_os = "hermit")'.dependencies.hermit-sys]
-path = "../../hermit-sys"
+[target.'cfg(target_os = "hermit")'.dependencies.hermit]
+path = "../../hermit"
 default-features = false
 
 [features]
 default = ["pci", "acpi", "tcp", "smp"]
-vga = ["hermit-sys/vga"]
-dhcpv4 = ["hermit-sys/dhcpv4"]
-pci = ["hermit-sys/pci"]
-pci-ids = ["hermit-sys/pci-ids"]
-acpi = ["hermit-sys/acpi"]
-fsgsbase = ["hermit-sys/fsgsbase"]
-smp = ["hermit-sys/smp"]
-tcp = ["hermit-sys/tcp"]
-instrument = ["hermit-sys/instrument"]
-rtl8139 = ["hermit-sys/rtl8139"]
+vga = ["hermit/vga"]
+dhcpv4 = ["hermit/dhcpv4"]
+pci = ["hermit/pci"]
+pci-ids = ["hermit/pci-ids"]
+acpi = ["hermit/acpi"]
+fsgsbase = ["hermit/fsgsbase"]
+smp = ["hermit/smp"]
+tcp = ["hermit/tcp"]
+instrument = ["hermit/instrument"]
+rtl8139 = ["hermit/rtl8139"]
 
 [[bin]]
 name = "server-bw"

diff --git a/benches/netbench/src/rust-tcp-bw/client.rs b/benches/netbench/src/rust-tcp-bw/client.rs
@@ -1,7 +1,7 @@
 #![allow(unused_imports)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 use clap::Parser;
 use rust_tcp_io_perf::config::Config;

diff --git a/benches/netbench/src/rust-tcp-bw/server.rs b/benches/netbench/src/rust-tcp-bw/server.rs
@@ -1,7 +1,7 @@
 #![allow(unused_imports)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 use clap::Parser;
 use rust_tcp_io_perf::config::Config;

diff --git a/benches/netbench/src/rust-tcp-latency/client.rs b/benches/netbench/src/rust-tcp-latency/client.rs
@@ -1,7 +1,7 @@
 #![allow(unused_imports)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 use clap::Parser;
 use rust_tcp_io_perf::config::Config;

diff --git a/benches/netbench/src/rust-tcp-latency/server.rs b/benches/netbench/src/rust-tcp-latency/server.rs
@@ -1,7 +1,7 @@
 #![allow(unused_imports)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 use clap::Parser;
 use rust_tcp_io_perf::config::Config;

diff --git a/examples/demo/Cargo.toml b/examples/demo/Cargo.toml
@@ -21,8 +21,8 @@ path = "src/matrix_multiplication.rs"
 rayon = "1.5"
 num_cpus = "1.13"
 
-[target.'cfg(target_os = "hermit")'.dependencies.hermit-sys]
-path = "../../hermit-sys"
+[target.'cfg(target_os = "hermit")'.dependencies.hermit]
+path = "../../hermit"
 default-features = false
 
 [target.'cfg(target_arch = "aarch64")'.dependencies.aarch64]
@@ -31,11 +31,11 @@ default-features = false
 
 [features]
 default = ["pci", "acpi", "smp", "fs"]
-vga = ["hermit-sys/vga"]
-pci = ["hermit-sys/pci"]
-fs = ["hermit-sys/fs"]
-acpi = ["hermit-sys/acpi"]
-pci-ids = ["hermit-sys/pci-ids"]
-fsgsbase = ["hermit-sys/fsgsbase"]
-smp = ["hermit-sys/smp"]
-instrument = ["hermit-sys/instrument"]
+vga = ["hermit/vga"]
+pci = ["hermit/pci"]
+fs = ["hermit/fs"]
+acpi = ["hermit/acpi"]
+pci-ids = ["hermit/pci-ids"]
+fsgsbase = ["hermit/fsgsbase"]
+smp = ["hermit/smp"]
+instrument = ["hermit/instrument"]
diff --git a/examples/demo/src/main.rs b/examples/demo/src/main.rs
@@ -3,7 +3,7 @@
 #![feature(thread_id_value)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 mod tests;
 

diff --git a/examples/demo/src/matrix_multiplication.rs b/examples/demo/src/matrix_multiplication.rs
@@ -3,7 +3,7 @@
 #![feature(thread_id_value)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 mod tests;
 

diff --git a/examples/demo/src/pi_sequential.rs b/examples/demo/src/pi_sequential.rs
@@ -3,7 +3,7 @@
 #![feature(thread_id_value)]
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 mod tests;
 

diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml
@@ -5,17 +5,17 @@ authors = ["Stefan Lankes <slankes@eonerc.rwth-aachen.de>"]
 edition = "2021"
 publish = false
 
-[target.'cfg(target_os = "hermit")'.dependencies.hermit-sys]
-path = "../../hermit-sys"
+[target.'cfg(target_os = "hermit")'.dependencies.hermit]
+path = "../../hermit"
 default-features = false
 
 [features]
 default = ["pci", "acpi"]
-vga = ["hermit-sys/vga"]
-pci = ["hermit-sys/pci"]
-pci-ids = ["hermit-sys/pci-ids"]
-acpi = ["hermit-sys/acpi"]
-fsgsbase = ["hermit-sys/fsgsbase"]
-smp = ["hermit-sys/smp"]
-instrument = ["hermit-sys/instrument"]
-fs = ["hermit-sys/fs"]
+vga = ["hermit/vga"]
+pci = ["hermit/pci"]
+pci-ids = ["hermit/pci-ids"]
+acpi = ["hermit/acpi"]
+fsgsbase = ["hermit/fsgsbase"]
+smp = ["hermit/smp"]
+instrument = ["hermit/instrument"]
+fs = ["hermit/fs"]
diff --git a/examples/hello_world/src/main.rs b/examples/hello_world/src/main.rs
@@ -1,5 +1,5 @@
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 fn main() {
 	println!("Hello World!");

diff --git a/examples/httpd/Cargo.toml b/examples/httpd/Cargo.toml
@@ -11,21 +11,21 @@ tiny_http = "0.12"
 [dependencies.time]
 version = "0.3"
 
-[target.'cfg(target_os = "hermit")'.dependencies.hermit-sys]
-path = "../../hermit-sys"
+[target.'cfg(target_os = "hermit")'.dependencies.hermit]
+path = "../../hermit"
 default-features = false
 
 [features]
 default = ["pci", "pci-ids", "acpi", "tcp"]
-vga = ["hermit-sys/vga"]
-dhcpv4 = ["hermit-sys/dhcpv4"]
-pci = ["hermit-sys/pci"]
-pci-ids = ["hermit-sys/pci-ids"]
-acpi = ["hermit-sys/acpi"]
-fsgsbase = ["hermit-sys/fsgsbase"]
-smp = ["hermit-sys/smp"]
-tcp = ["hermit-sys/tcp"]
-instrument = ["hermit-sys/instrument"]
-trace = ["hermit-sys/trace"]
-rtl8139 = ["hermit-sys/rtl8139"]
+vga = ["hermit/vga"]
+dhcpv4 = ["hermit/dhcpv4"]
+pci = ["hermit/pci"]
+pci-ids = ["hermit/pci-ids"]
+acpi = ["hermit/acpi"]
+fsgsbase = ["hermit/fsgsbase"]
+smp = ["hermit/smp"]
+tcp = ["hermit/tcp"]
+instrument = ["hermit/instrument"]
+trace = ["hermit/trace"]
+rtl8139 = ["hermit/rtl8139"]
 ci = []
diff --git a/examples/httpd/src/main.rs b/examples/httpd/src/main.rs
@@ -1,7 +1,7 @@
 /// Example is derived from tiny-http example
 /// https://github.com/tiny-http/tiny-http/blob/master/examples/hello-world.rs
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 fn main() {
 	let crab = vec![0xF0_u8, 0x9F_u8, 0xA6_u8, 0x80_u8];

diff --git a/examples/tokio/Cargo.toml b/examples/tokio/Cargo.toml
@@ -8,19 +8,19 @@ publish = false
 [dependencies]
 tokio = { version = "1.19", default-features = false, features = ["rt", "rt-multi-thread", "macros"] }
 
-[target.'cfg(target_os = "hermit")'.dependencies.hermit-sys]
-path = "../../hermit-sys"
+[target.'cfg(target_os = "hermit")'.dependencies.hermit]
+path = "../../hermit"
 default-features = false
 
 [features]
 default = ["pci", "pci-ids", "acpi", "dhcpv4", "tcp"]
-vga = ["hermit-sys/vga"]
-dhcpv4 = ["hermit-sys/dhcpv4"]
-pci = ["hermit-sys/pci"]
-pci-ids = ["hermit-sys/pci-ids"]
-acpi = ["hermit-sys/acpi"]
-fsgsbase = ["hermit-sys/fsgsbase"]
-smp = ["hermit-sys/smp"]
-tcp = ["hermit-sys/tcp"]
-instrument = ["hermit-sys/instrument"]
-trace = ["hermit-sys/trace"]
+vga = ["hermit/vga"]
+dhcpv4 = ["hermit/dhcpv4"]
+pci = ["hermit/pci"]
+pci-ids = ["hermit/pci-ids"]
+acpi = ["hermit/acpi"]
+fsgsbase = ["hermit/fsgsbase"]
+smp = ["hermit/smp"]
+tcp = ["hermit/tcp"]
+instrument = ["hermit/instrument"]
+trace = ["hermit/trace"]
diff --git a/examples/tokio/src/main.rs b/examples/tokio/src/main.rs
@@ -1,7 +1,7 @@
 // A minimal tokio example. Network support is currently not supported.
 
 #[cfg(target_os = "hermit")]
-use hermit_sys as _;
+use hermit as _;
 
 async fn say_world() {
 	println!("world");

diff --git a/hermit-sys/Cargo.toml → hermit/Cargo.toml b/hermit-sys/Cargo.toml → hermit/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "hermit-sys"
+name = "hermit"
 version = "0.5.3"
 authors = ["Stefan Lankes"]
 license = "MIT OR Apache-2.0"

diff --git a/hermit-sys/LICENSE-APACHE → hermit/LICENSE-APACHE b/hermit-sys/LICENSE-APACHE → hermit/LICENSE-APACHE
diff --git a/hermit-sys/LICENSE-MIT → hermit/LICENSE-MIT b/hermit-sys/LICENSE-MIT → hermit/LICENSE-MIT
diff --git a/hermit-sys/README.md → hermit/README.md b/hermit-sys/README.md → hermit/README.md
@@ -1,8 +1,8 @@
-# hermit-sys
+# hermit
 
-[![Crates.io](https://img.shields.io/crates/v/hermit-sys.svg)](https://crates.io/crates/hermit-sys)
-[![Documentation](https://img.shields.io/badge/docs-latest-blue.svg)](https://hermitcore.github.io/rusty-hermit/hermit_sys/)
-[![License](https://img.shields.io/crates/l/hermit-sys.svg)](https://img.shields.io/crates/l/hermit-sys.svg)
+[![Crates.io](https://img.shields.io/crates/v/hermit.svg)](https://crates.io/crates/hermit)
+[![Documentation](https://img.shields.io/badge/docs-latest-blue.svg)](https://hermitcore.github.io/rusty-hermit/hermit/)
+[![License](https://img.shields.io/crates/l/hermit.svg)](https://img.shields.io/crates/l/hermit.svg)
 
 This is a container for the library operating system [RustyHermit](https://github.com/hermitcore/kernel) and is used to link the libos to the application.
 

diff --git a/hermit-sys/build.rs → hermit/build.rs b/hermit-sys/build.rs → hermit/build.rs
diff --git a/hermit-sys/src/dummy.rs → hermit/src/dummy.rs b/hermit-sys/src/dummy.rs → hermit/src/dummy.rs
diff --git a/hermit-sys/src/lib.rs → hermit/src/lib.rs b/hermit-sys/src/lib.rs → hermit/src/lib.rs