Rename aster-std to aster-nix

Cargo.lock

@@ -221,37 +221,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "aster-rights"
-version = "0.1.0"
-dependencies = [
- "aster-rights-proc",
- "bitflags 1.3.2",
- "typeflags",
- "typeflags-util",
-]
-
-[[package]]
-name = "aster-rights-proc"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "aster-runner"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "clap",
- "linux-bzimage-builder",
- "rand",
- "xmas-elf 0.8.0",
-]
-
-[[package]]
-name = "aster-std"
+name = "aster-nix"
 version = "0.1.0"
 dependencies = [
  "align_ext",
@@ -296,6 +266,36 @@ dependencies = [
  "xmas-elf 0.8.0",
 ]
 
+[[package]]
+name = "aster-rights"
+version = "0.1.0"
+dependencies = [
+ "aster-rights-proc",
+ "bitflags 1.3.2",
+ "typeflags",
+ "typeflags-util",
+]
+
+[[package]]
+name = "aster-rights-proc"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "aster-runner"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "linux-bzimage-builder",
+ "rand",
+ "xmas-elf 0.8.0",
+]
+
 [[package]]
 name = "aster-time"
 version = "0.1.0"
@@ -350,7 +350,7 @@ version = "0.3.0"
 dependencies = [
  "aster-frame",
  "aster-framebuffer",
- "aster-std",
+ "aster-nix",
  "aster-time",
  "component",
  "x86_64",

Cargo.toml

@@ -9,7 +9,7 @@ path = "kernel/main.rs"
 
 [dependencies]
 aster-frame = { path = "framework/aster-frame" }
-aster-std = { path = "services/libs/aster-std" }
+aster-nix = { path = "services/aster-nix" }
 component = { path = "services/libs/comp-sys/component" }
 
 [dev-dependencies]
@@ -40,6 +40,7 @@ members = [
     "framework/libs/linux-bzimage/setup",
     "framework/libs/ktest",
     "framework/libs/tdx-guest",
+    "services/aster-nix",
     "services/comps/block",
     "services/comps/console",
     "services/comps/framebuffer",
@@ -52,7 +53,6 @@ members = [
     "services/libs/int-to-c-enum/derive",
     "services/libs/aster-rights",
     "services/libs/aster-rights-proc",
-    "services/libs/aster-std",
     "services/libs/aster-util",
     "services/libs/keyable-arc",
     "services/libs/typeflags",
@@ -67,4 +67,4 @@ exclude = [
 ]
 
 [features]
-intel_tdx = ["aster-frame/intel_tdx", "aster-std/intel_tdx"]
+intel_tdx = ["aster-frame/intel_tdx", "aster-nix/intel_tdx"]

Components.toml

@@ -1,6 +1,6 @@
 # template
 [components]
-std = { name = "aster-std" }
+nix = { name = "aster-nix" }
 virtio = { name = "aster-virtio" }
 input = { name = "aster-input" }
 block = { name = "aster-block" }
@@ -11,5 +11,5 @@ network = { name = "aster-network" }
 main = { name = "asterinas" }
 
 [whitelist]
-[whitelist.std.run_first_process]
+[whitelist.nix.run_first_process]
 main = true

kernel/main.rs

@@ -14,6 +14,6 @@ pub fn main() -> ! {
     aster_frame::init();
     early_println!("[kernel] finish init aster_frame");
     component::init_all(component::parse_metadata!()).unwrap();
-    aster_std::init();
-    aster_std::run_first_process();
+    aster_nix::init();
+    aster_nix::run_first_process();
 }

services/aster-nix/Cargo.toml

@@ -1,28 +1,28 @@
 [package]
-name = "aster-std"
+name = "aster-nix"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aster-frame = { path = "../../../framework/aster-frame" }
-align_ext = { path = "../../../framework/libs/align_ext" }
+aster-frame = { path = "../../framework/aster-frame" }
+align_ext = { path = "../../framework/libs/align_ext" }
 pod = { git = "https://github.com/asterinas/pod", rev = "d7dba56" }
-aster-input = { path = "../../comps/input" }
-aster-block = { path = "../../comps/block" }
-aster-network = { path = "../../comps/network" }
-aster-console = { path = "../../comps/console" }
-aster-time = { path = "../../comps/time" }
-aster-virtio = { path = "../../comps/virtio" }
-aster-rights = { path = "../aster-rights" }
-controlled = { path = "../../libs/comp-sys/controlled" }
-typeflags = { path = "../typeflags" }
-typeflags-util = { path = "../typeflags-util" }
-aster-rights-proc = { path = "../aster-rights-proc" }
-aster-util = { path = "../aster-util" }
-int-to-c-enum = { path = "../../libs/int-to-c-enum" }
-cpio-decoder = { path = "../cpio-decoder" }
+aster-input = { path = "../comps/input" }
+aster-block = { path = "../comps/block" }
+aster-network = { path = "../comps/network" }
+aster-console = { path = "../comps/console" }
+aster-time = { path = "../comps/time" }
+aster-virtio = { path = "../comps/virtio" }
+aster-rights = { path = "../libs/aster-rights" }
+controlled = { path = "../libs/comp-sys/controlled" }
+typeflags = { path = "../libs/typeflags" }
+typeflags-util = { path = "../libs/typeflags-util" }
+aster-rights-proc = { path = "../libs/aster-rights-proc" }
+aster-util = { path = "../libs/aster-util" }
+int-to-c-enum = { path = "../libs/int-to-c-enum" }
+cpio-decoder = { path = "../libs/cpio-decoder" }
 ascii = { version = "1.1", default-features = false, features = ["alloc"] }
 intrusive-collections = "0.9.5"
 time = { version = "0.3", default-features = false, features = ["alloc"] }
@@ -40,8 +40,8 @@ smoltcp = { version = "0.9.1", default-features = false, features = [
     "socket-raw",
     "socket-dhcpv4",
 ] }
-ktest = { path = "../../../framework/libs/ktest" }
-tdx-guest = { path = "../../../framework/libs/tdx-guest", optional = true }
+ktest = { path = "../../framework/libs/ktest" }
+tdx-guest = { path = "../../framework/libs/tdx-guest", optional = true }
 
 # parse elf file
 xmas-elf = "0.8.0"
@@ -49,7 +49,7 @@ xmas-elf = "0.8.0"
 # data-structures
 bitflags = "1.3"
 ringbuf = { version = "0.3.2", default-features = false, features = ["alloc"] }
-keyable-arc = { path = "../keyable-arc" }
+keyable-arc = { path = "../libs/keyable-arc" }
 # unzip initramfs
 libflate = { git = "https://github.com/asterinas/libflate", rev = "b781da6", features = [
     "no_std",

services/aster-nix/src/lib.rs

@@ -89,7 +89,7 @@ fn init_thread() {
     }));
     thread.join();
     info!(
-        "[aster-std/lib.rs] spawn kernel thread, tid = {}",
+        "[aster-nix/lib.rs] spawn kernel thread, tid = {}",
         thread.tid()
     );
     thread::work_queue::init();