fix: update the bash env

update dep
Godones · Nov 23, 2023 · 12e33f2 · 12e33f2
1 parent 3c4e4d7
commit 12e33f2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/apps/final_test/src/main.rs b/apps/final_test/src/main.rs
@@ -59,6 +59,6 @@ const BASH_ENV: &[*const u8] = &[
     "PS1=\x1b[1m\x1b[32mAlien\x1b[0m:\x1b[1m\x1b[34m\\w\x1b[0m\\$ \0".as_ptr(),
     "_=/bin/bash\0".as_ptr(),
     "PATH=/:/bin\0".as_ptr(),
-    "LD_LIBRARY_PATH=/\0".as_ptr(),
+    "LD_LIBRARY_PATH=/bin\0".as_ptr(),
     core::ptr::null(),
 ];
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -24,7 +24,7 @@ page-table = { git = "https://github.com/os-module/page-table.git", branch = "de
 visionfive2-sd = { git = "https://github.com/os-module/visionfive2-sd.git", optional = true }
 tracer = { git = "https://github.com/os-module/tracer" }
 preprint = "0.1.0"
-rslab = { version = "0.2.1" ,optional = true}
+rslab = { version = "0.2.1", optional = true }
 
 syscall-table = { git = "https://github.com/os-module/syscall-table.git" }
 #syscall-table = {path = "../../os-modules/syscall-table",features = []}
@@ -33,44 +33,53 @@ pager = { git = "https://github.com/os-module/pager", default-features = false,
 gmanager = { path = "../modules/gmanager" }
 kernel-sync = { git = "https://github.com/os-module/kernel-sync.git" }
 
-pconst = { git = "https://github.com/os-module/pconst.git",features = ["trick"] }
+pconst = { git = "https://github.com/os-module/pconst.git", features = [
+    "trick",
+] }
 #pconst = { path = "../../os-modules/pconst",features = ["trick"]}
 
 basemachine = { path = "../modules/basemachine" }
 uart16550 = { version = "0.0.1", optional = true }
 uart8250 = { git = "https://github.com/os-module/uart-rs.git", optional = true }
-smpscheduler = {git = "https://github.com/os-module/smpscheduler.git" }
+smpscheduler = { git = "https://github.com/os-module/smpscheduler.git" }
 talc = { version = "1.0", optional = true }
 buddy_system_allocator = { version = "0.9.0", optional = true }
 
 downcast-rs = { version = "1.2.0", default-features = false }
 
-#vfscore = {git = "https://github.com/os-module/rvfs.git",features = ["linux_error"]}
-#devfs = {git = "https://github.com/os-module/rvfs.git"}
-#dynfs =  {git = "https://github.com/os-module/rvfs.git"}
-#ramfs =  {git = "https://github.com/os-module/rvfs.git"}
-#fat-vfs =  {git = "https://github.com/os-module/rvfs.git"}
+vfscore = { git = "https://github.com/os-module/rvfs.git", features = [
+    "linux_error",
+] }
+devfs = { git = "https://github.com/os-module/rvfs.git" }
+dynfs = { git = "https://github.com/os-module/rvfs.git" }
+ramfs = { git = "https://github.com/os-module/rvfs.git" }
+fat-vfs = { git = "https://github.com/os-module/rvfs.git" }
 
-vfscore = {path = "../../os-modules/rvfs/vfscore",features = ["linux_error"]}
-devfs = {path = "../../os-modules/rvfs/devfs"}
-dynfs =  {path = "../../os-modules/rvfs/dynfs"}
-ramfs =  {path = "../../os-modules/rvfs/ramfs"}
-fat-vfs =  {path = "../../os-modules/rvfs/fat-vfs"}
+# vfscore = { path = "../../os-modules/rvfs/vfscore", features = ["linux_error"] }
+# devfs = { path = "../../os-modules/rvfs/devfs" }
+# dynfs = { path = "../../os-modules/rvfs/dynfs" }
+# ramfs = { path = "../../os-modules/rvfs/ramfs" }
+# fat-vfs = { path = "../../os-modules/rvfs/fat-vfs" }
 
 simple-net = { path = "../modules/simple-net" }
 [dependencies.smoltcp]
 git = "https://github.com/rcore-os/smoltcp.git"
 rev = "2ade274"
 default-features = false
 features = [
-    "alloc", "log", # no std
+    "alloc",
+    "log",             # no std
     "medium-ethernet",
     "proto-ipv4",
-    "socket-raw", "socket-icmp", "socket-udp", "socket-tcp", "socket-dns",
+    "socket-raw",
+    "socket-icmp",
+    "socket-udp",
+    "socket-tcp",
+    "socket-dns",
 ]
 
 [features]
-default = ["pager_bitmap", ]
+default = ["pager_bitmap"]
 vf2 = ["visionfive2-sd", "uart8250"]
 cv1811h = []
 hifive = ["uart16550"]
@@ -82,4 +91,4 @@ talloc = ["talc"]
 buddy = ["buddy_system_allocator"]
 
 pager_buddy = ["pager/buddy"]
-pager_bitmap = ["pager/bitmap"]
+pager_bitmap = ["pager/bitmap"]