Moves kernel to top-level (#1012)

2024-10-06 16:03:22 +00:00 · 2024-10-04 00:43:26 +07:00 · 2024-10-04 00:43:26 +07:00 · 40dd689596
commit 40dd689596
parent 4209655fbb
41 changed files with 4 additions and 4 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -53,7 +53,7 @@ add_custom_target(libgui

 add_custom_target(kernel
    COMMAND cargo ${KERNEL_TOOLCHAIN} build $<IF:$<CONFIG:Debug>,--profile=dev,--release> --target ${KERNEL_TARGET} ${KERNEL_OPTS}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/obkrnl
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/kernel
    BYPRODUCTS ${KERNEL})

 add_dependencies(libgui kernel)
--- a/Cargo.toml
+++ b/Cargo.toml
@ -2,13 +2,13 @@
 resolver = "2"
 members = [
    "gui",
+    "kernel",
    "src/fs",
    "src/gmtx",
    "src/kernel",
    "src/llt",
    "src/macros",
    "src/obconf",
-    "src/obkrnl",
    "src/param",
    "src/pfs",
    "src/pkg",
--- a/src/obkrnl/.cargo/config.toml
+++ b/src/obkrnl/.cargo/config.toml
--- a/src/obkrnl/Cargo.toml
+++ b/src/obkrnl/Cargo.toml
@ -7,7 +7,7 @@ edition = "2021"
 anstyle = { version = "1.0.8", default-features = false }
 bitfield-struct = "0.8.0"
 hashbrown = "0.14.5"
-macros = { path = "../macros" }
-obconf = { path = "../obconf", features = ["virt"] }
+macros = { path = "../src/macros" }
+obconf = { path = "../src/obconf", features = ["virt"] }
 spin = { version = "0.9.8", features = ["spin_mutex"], default-features = false }
 talc = { version = "4.4.1", default-features = false }
--- a/src/obkrnl/LICENSE-APACHE
+++ b/src/obkrnl/LICENSE-APACHE
--- a/src/obkrnl/LICENSE-MIT
+++ b/src/obkrnl/LICENSE-MIT
--- a/src/obkrnl/build.rs
+++ b/src/obkrnl/build.rs
--- a/src/obkrnl/src/aarch64.rs
+++ b/src/obkrnl/src/aarch64.rs
--- a/src/obkrnl/src/config/aarch64.rs
+++ b/src/obkrnl/src/config/aarch64.rs
--- a/src/obkrnl/src/config/mod.rs
+++ b/src/obkrnl/src/config/mod.rs
--- a/src/obkrnl/src/config/x86_64.rs
+++ b/src/obkrnl/src/config/x86_64.rs
--- a/src/obkrnl/src/console/mod.rs
+++ b/src/obkrnl/src/console/mod.rs
--- a/src/obkrnl/src/console/vm.rs
+++ b/src/obkrnl/src/console/vm.rs
--- a/src/obkrnl/src/context/aarch64.rs
+++ b/src/obkrnl/src/context/aarch64.rs
--- a/src/obkrnl/src/context/arc.rs
+++ b/src/obkrnl/src/context/arc.rs
--- a/src/obkrnl/src/context/local.rs
+++ b/src/obkrnl/src/context/local.rs
--- a/src/obkrnl/src/context/mod.rs
+++ b/src/obkrnl/src/context/mod.rs
--- a/src/obkrnl/src/context/x86_64.rs
+++ b/src/obkrnl/src/context/x86_64.rs
--- a/src/obkrnl/src/imgfmt/elf/mod.rs
+++ b/src/obkrnl/src/imgfmt/elf/mod.rs
--- a/src/obkrnl/src/imgfmt/mod.rs
+++ b/src/obkrnl/src/imgfmt/mod.rs
--- a/src/obkrnl/src/lock/gutex/guard.rs
+++ b/src/obkrnl/src/lock/gutex/guard.rs
--- a/src/obkrnl/src/lock/gutex/mod.rs
+++ b/src/obkrnl/src/lock/gutex/mod.rs
--- a/src/obkrnl/src/lock/mod.rs
+++ b/src/obkrnl/src/lock/mod.rs
--- a/src/obkrnl/src/lock/mutex/mod.rs
+++ b/src/obkrnl/src/lock/mutex/mod.rs
--- a/src/obkrnl/src/main.rs
+++ b/src/obkrnl/src/main.rs
--- a/src/obkrnl/src/malloc/mod.rs
+++ b/src/obkrnl/src/malloc/mod.rs
--- a/src/obkrnl/src/malloc/stage1.rs
+++ b/src/obkrnl/src/malloc/stage1.rs
--- a/src/obkrnl/src/malloc/stage2.rs
+++ b/src/obkrnl/src/malloc/stage2.rs
--- a/src/obkrnl/src/panic/mod.rs
+++ b/src/obkrnl/src/panic/mod.rs
--- a/src/obkrnl/src/panic/vm.rs
+++ b/src/obkrnl/src/panic/vm.rs
--- a/src/obkrnl/src/proc/mod.rs
+++ b/src/obkrnl/src/proc/mod.rs
--- a/src/obkrnl/src/proc/pid.rs
+++ b/src/obkrnl/src/proc/pid.rs
--- a/src/obkrnl/src/proc/process.rs
+++ b/src/obkrnl/src/proc/process.rs
--- a/src/obkrnl/src/proc/thread.rs
+++ b/src/obkrnl/src/proc/thread.rs
--- a/src/obkrnl/src/proc/thread/cell.rs
+++ b/src/obkrnl/src/proc/thread/cell.rs
--- a/src/obkrnl/src/sched/mod.rs
+++ b/src/obkrnl/src/sched/mod.rs
--- a/src/obkrnl/src/sched/sleep.rs
+++ b/src/obkrnl/src/sched/sleep.rs
--- a/src/obkrnl/src/uma/bucket.rs
+++ b/src/obkrnl/src/uma/bucket.rs
--- a/src/obkrnl/src/uma/cache.rs
+++ b/src/obkrnl/src/uma/cache.rs
--- a/src/obkrnl/src/uma/mod.rs
+++ b/src/obkrnl/src/uma/mod.rs
--- a/src/obkrnl/src/x86_64.rs
+++ b/src/obkrnl/src/x86_64.rs