feat: seperate sync and frame_allocator from kernel

Byte-OS · Apr 17, 2024 · 9b8c1fe · 9b8c1fe
1 parent fe21c09
commit 9b8c1fe
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 434 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -15,7 +15,7 @@ serde_derive = "1.0.136"
 [dependencies]
 allocator = { path = "../crates/allocator" }
 crate_interface = { git = "https://github.com/Byte-OS/crate_interface.git" }
-frame_allocator = { path = "../modules/frame_allocator" }
+frame_allocator = { git = "https://github.com/Byte-OS/bit_frame_allocator.git" }
 logging = { path = "../modules/logging" }
 log = "0.4"
 devices = { path = "../modules/devices" }
@@ -25,7 +25,7 @@ fs = { path = "../modules/fs" }
 fdt = "0.1.5"
 executor = { path = "../modules/executor" }
 xmas-elf = "0.9.0"
-sync = { path = "../modules/sync" }
+sync = { git = "https://github.com/Byte-OS/sync.git" }
 bitflags = "2.0.2"
 signal = { git = "https://github.com/Byte-OS/signal.git" }
 bit_field = "0.10.1"

diff --git a/modules/devfs/Cargo.toml b/modules/devfs/Cargo.toml
@@ -10,7 +10,7 @@ vfscore = { git = "https://github.com/Byte-OS/vfscore.git" }
 logging = { path = "../logging" }
 devices = { path = "../devices" }
 log = "0.4"
-sync = { path = "../sync" }
+sync = { git = "https://github.com/Byte-OS/sync.git" }
 bitflags = "2.0.2"
 num-traits = { version = "0.2", default-features = false}
 num-derive = "0.4"

diff --git a/modules/devices/Cargo.toml b/modules/devices/Cargo.toml
@@ -12,7 +12,7 @@ arch = { git = "https://github.com/Byte-OS/arch.git" }
 fdt = "0.1.5"
 linkme = { version = "0.3.22", features = ["used_linker"] }
 log = "0.4"
-sync = { path = "../sync" }
+sync = { git = "https://github.com/Byte-OS/sync.git" }
 virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "f1d1cbb"}
-frame_allocator = { path = "../frame_allocator" }
+frame_allocator = { git = "https://github.com/Byte-OS/bit_frame_allocator.git" }
 timestamp = { git = "https://github.com/Byte-OS/timestamp.git" }
diff --git a/modules/executor/Cargo.toml b/modules/executor/Cargo.toml
@@ -9,8 +9,8 @@ edition = "2021"
 crossbeam-queue = { version = "0.3.8", default-features = false, features = ["alloc"] }
 logging = { path = "../logging" }
 arch = { git = "https://github.com/Byte-OS/arch.git" }
-sync = { path = "../sync" }
-frame_allocator = { path = "../frame_allocator" }
+sync = { git = "https://github.com/Byte-OS/sync.git" }
+frame_allocator = { git = "https://github.com/Byte-OS/bit_frame_allocator.git" }
 log = "0.4"
 fs = { path = "../fs" }
 devfs = { path = "../devfs" }

diff --git a/modules/frame_allocator/Cargo.toml b/modules/frame_allocator/Cargo.toml
diff --git a/modules/frame_allocator/src/lib.rs b/modules/frame_allocator/src/lib.rs
diff --git a/modules/fs/Cargo.toml b/modules/fs/Cargo.toml
@@ -8,13 +8,13 @@ edition = "2021"
 [dependencies]
 log = "0.4"
 vfscore = { git = "https://github.com/Byte-OS/vfscore.git" }
-sync = { path = "../sync" }
+sync = { git = "https://github.com/Byte-OS/sync.git" }
 devices = { path = "../devices" }
 logging = { path = "../logging" }
 devfs = { path = "../devfs" }
 ramfs = { path = "../ramfs" }
 procfs = { path = "../procfs" }
-frame_allocator = { path = "../frame_allocator" }
+frame_allocator = { git = "https://github.com/Byte-OS/bit_frame_allocator.git" }
 arch = { git = "https://github.com/Byte-OS/arch.git" }
 
 [dependencies.fatfs]

diff --git a/modules/hal/Cargo.toml b/modules/hal/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 arch = { git = "https://github.com/Byte-OS/arch.git" }
 log = "0.4"
-frame_allocator = { path = "../frame_allocator" }
+frame_allocator = { git = "https://github.com/Byte-OS/bit_frame_allocator.git" }
 devices = { path = "../devices" }
-sync = { path = "../sync" }
+sync = { git = "https://github.com/Byte-OS/sync.git" }
diff --git a/modules/logging/Cargo.toml b/modules/logging/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2021"
 log = "0.4"
 arch = { git = "https://github.com/Byte-OS/arch.git" }
 devices = { path = "../devices" }
-sync = { path = "../sync" }
+sync = { git = "https://github.com/Byte-OS/sync.git" }