diff --git a/src/.cargo/config.toml b/.cargo/config.toml similarity index 100% rename from src/.cargo/config.toml rename to .cargo/config.toml diff --git a/.gitattributes b/.gitattributes index 5da868347..112cce3c0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,10 @@ -src/apps/hello_world/hello_world filter=lfs diff=lfs merge=lfs -text -src/apps/fork/fork filter=lfs diff=lfs merge=lfs -text -src/apps/hello_c/hello filter=lfs diff=lfs merge=lfs -text -src/apps/execve/execve filter=lfs diff=lfs merge=lfs -text -src/apps/execve/hello filter=lfs diff=lfs merge=lfs -text -src/apps/fork_c/fork filter=lfs diff=lfs merge=lfs -text -src/apps/signal_c/signal_test filter=lfs diff=lfs merge=lfs -text -src/apps/busybox/busybox filter=lfs diff=lfs merge=lfs -text -src/apps/pthread/pthread_test filter=lfs diff=lfs merge=lfs -text -src/apps/hello_pie/hello filter=lfs diff=lfs merge=lfs -text +regression/apps/hello_world/hello_world filter=lfs diff=lfs merge=lfs -text +regression/apps/fork/fork filter=lfs diff=lfs merge=lfs -text +regression/apps/hello_c/hello filter=lfs diff=lfs merge=lfs -text +regression/apps/execve/execve filter=lfs diff=lfs merge=lfs -text +regression/apps/execve/hello filter=lfs diff=lfs merge=lfs -text +regression/apps/fork_c/fork filter=lfs diff=lfs merge=lfs -text +regression/apps/signal_c/signal_test filter=lfs diff=lfs merge=lfs -text +regression/apps/busybox/busybox filter=lfs diff=lfs merge=lfs -text +regression/apps/pthread/pthread_test filter=lfs diff=lfs merge=lfs -text +regression/apps/hello_pie/hello filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 9981fa992..19881b377 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,8 @@ target/ **/.DS_Store # Ramdisk file -src/ramdisk/initramfs/ -src/ramdisk/build/ +regression/ramdisk/initramfs/ +regression/ramdisk/build/ # qemu log file qemu.log diff --git a/src/Cargo.lock b/Cargo.lock similarity index 100% rename from src/Cargo.lock rename to Cargo.lock diff --git a/src/Cargo.toml b/Cargo.toml similarity index 79% rename from src/Cargo.toml rename to Cargo.toml index ef60250eb..143ce953a 100644 --- a/src/Cargo.toml +++ b/Cargo.toml @@ -3,11 +3,15 @@ name = "jinux" version = "0.1.0" edition = "2021" +[[bin]] +name = "jinux" +path = "kernel/main.rs" + [dependencies] limine = "0.1.10" jinux-frame = { path = "framework/jinux-frame" } jinux-std = { path = "services/libs/jinux-std" } -component = { path = "services/comp-sys/component" } +component = { path = "services/libs/comp-sys/component" } [dev-dependencies] x86_64 = "0.14.2" @@ -33,4 +37,4 @@ members = [ "services/libs/cpio-decoder", ] -exclude = ["services/comp-sys/controlled", "services/comp-sys/cargo-component"] +exclude = ["services/libs/comp-sys/controlled", "services/libs/comp-sys/cargo-component"] diff --git a/src/Components.toml b/Components.toml similarity index 100% rename from src/Components.toml rename to Components.toml diff --git a/Makefile b/Makefile index ee191869d..b8cf03249 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: all build clean docs fmt run setup test tools -all: build test +all: build setup: @rustup component add rust-src @@ -9,28 +9,28 @@ setup: @cargo install mdbook build: - @make --no-print-directory -C src/ramdisk - @cd src && cargo kbuild + @make --no-print-directory -C regression/ramdisk + @cargo kbuild tools: - @cd src/services/comp-sys && cargo install --path cargo-component + @cd services/libs/comp-sys && cargo install --path cargo-component run: build - @cd src && cargo krun + @cargo krun test: build - @cd src && cargo ktest + @cargo ktest docs: - @cd src && cargo doc # Build Rust docs + @cargo doc # Build Rust docs @echo "" # Add a blank line @cd docs && mdbook build # Build mdBook check: - @cd src && cargo fmt --check # Check Rust format issues - @cd src && cargo clippy # Check common programming mistakes + @cargo fmt --check # Check Rust format issues + @cargo clippy # Check common programming mistakes clean: - @cd src && cargo clean + @cargo clean @cd docs && mdbook clean - @make --no-print-directory -C src/ramdisk clean + @make --no-print-directory -C regression/ramdisk clean diff --git a/README.md b/README.md index 0fdd7f844..d2ef2e41a 100644 --- a/README.md +++ b/README.md @@ -23,16 +23,16 @@ As a zero-cost, least-privilege OS, Jinux provides the best of both worlds: the ## How to build and test While most code is written in Rust, the project-scope build process is governed -by Makefile. +by Makefile. The following commands are intended for use on an Ubuntu server that has installed qemu-system-x86_64. -Before downloading source code, install and init Git LFS since the project manage binaries with Git LFS. +### Preparation +Before downloading source code, install and init Git LFS since the project manages binaries with Git LFS. ```bash # 1. install git-lfs -brew install git-lfs # for mac -apt install git-lfs # for ubuntu +apt install git-lfs # 2. init git-lfs for current user -git lfs install --skip-repo # for mac & ubuntu +git lfs install --skip-repo ``` Then, download source codes as normal. @@ -46,22 +46,29 @@ all developmennt tools are installed. make setup ``` -Then, install some standalone tools (e.g., `cargo-component`) under the project directory. -``` bash -make tools -``` - -Set environmental variables to enable `cargo` find installed tools. +### build +Then, we can build the project. ```bash -export PATH=`pwd`/src/target/bin:${PATH} -``` - -Then, we can build and test the project. -```bash -make +make build ``` If everything goes well, then we can run the OS. ```bash make run ``` + +### Test +We can run unit tests and integration tests if building succeeds. +```bash +make test +``` + +If we want to check access control policy among components, install some standalone tools (e.g., `cargo-component`), and set environmental variables to enable `cargo` find installed tools under the project directory. +``` bash +make tools +export PATH=`pwd`/target/bin:${PATH} +``` +Then we can use the tool to check access control policy. +```bash +cargo component-check +``` diff --git a/src/boot/Cargo.toml b/boot/Cargo.toml similarity index 100% rename from src/boot/Cargo.toml rename to boot/Cargo.toml diff --git a/src/boot/limine/conf/limine.cfg b/boot/limine/conf/limine.cfg similarity index 100% rename from src/boot/limine/conf/limine.cfg rename to boot/limine/conf/limine.cfg diff --git a/src/boot/limine/conf/linker.ld b/boot/limine/conf/linker.ld similarity index 100% rename from src/boot/limine/conf/linker.ld rename to boot/limine/conf/linker.ld diff --git a/src/boot/limine/scripts/limine-build.sh b/boot/limine/scripts/limine-build.sh similarity index 95% rename from src/boot/limine/scripts/limine-build.sh rename to boot/limine/scripts/limine-build.sh index 726712409..69188a64f 100755 --- a/src/boot/limine/scripts/limine-build.sh +++ b/boot/limine/scripts/limine-build.sh @@ -25,7 +25,7 @@ cp target/limine/limine-cd.bin target/iso_root cp target/limine/limine-cd-efi.bin target/iso_root # Copy ramdisk -cp ramdisk/build/ramdisk.cpio target/iso_root +cp regression/ramdisk/build/ramdisk.cpio target/iso_root xorriso -as mkisofs \ -b limine-cd.bin \ diff --git a/src/boot/src/main.rs b/boot/src/main.rs similarity index 100% rename from src/boot/src/main.rs rename to boot/src/main.rs diff --git a/src/build.rs b/build.rs similarity index 100% rename from src/build.rs rename to build.rs diff --git a/src/framework/README.md b/framework/README.md similarity index 100% rename from src/framework/README.md rename to framework/README.md diff --git a/src/framework/jinux-frame/Cargo.toml b/framework/jinux-frame/Cargo.toml similarity index 94% rename from src/framework/jinux-frame/Cargo.toml rename to framework/jinux-frame/Cargo.toml index 6645f749b..025c18833 100644 --- a/src/framework/jinux-frame/Cargo.toml +++ b/framework/jinux-frame/Cargo.toml @@ -12,7 +12,7 @@ spin = "0.9.4" volatile = { version = "0.4.5", features = ["unstable"] } buddy_system_allocator = "0.9.0" pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } -align_ext = { path = "../align_ext" } +align_ext = { path = "../libs/align_ext" } intrusive-collections = "0.9.5" log = "0.4" lazy_static = { version = "1.0", features = ["spin_no_std"] } diff --git a/src/framework/jinux-frame/src/arch/mod.rs b/framework/jinux-frame/src/arch/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/mod.rs rename to framework/jinux-frame/src/arch/mod.rs diff --git a/src/framework/jinux-frame/src/arch/x86/boot/limine.rs b/framework/jinux-frame/src/arch/x86/boot/limine.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/boot/limine.rs rename to framework/jinux-frame/src/arch/x86/boot/limine.rs diff --git a/src/framework/jinux-frame/src/arch/x86/boot/mod.rs b/framework/jinux-frame/src/arch/x86/boot/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/boot/mod.rs rename to framework/jinux-frame/src/arch/x86/boot/mod.rs diff --git a/src/framework/jinux-frame/src/arch/x86/cpu.rs b/framework/jinux-frame/src/arch/x86/cpu.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/cpu.rs rename to framework/jinux-frame/src/arch/x86/cpu.rs diff --git a/src/framework/jinux-frame/src/arch/x86/device/cmos.rs b/framework/jinux-frame/src/arch/x86/device/cmos.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/device/cmos.rs rename to framework/jinux-frame/src/arch/x86/device/cmos.rs diff --git a/src/framework/jinux-frame/src/arch/x86/device/io_port.rs b/framework/jinux-frame/src/arch/x86/device/io_port.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/device/io_port.rs rename to framework/jinux-frame/src/arch/x86/device/io_port.rs diff --git a/src/framework/jinux-frame/src/arch/x86/device/mod.rs b/framework/jinux-frame/src/arch/x86/device/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/device/mod.rs rename to framework/jinux-frame/src/arch/x86/device/mod.rs diff --git a/src/framework/jinux-frame/src/arch/x86/device/pci.rs b/framework/jinux-frame/src/arch/x86/device/pci.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/device/pci.rs rename to framework/jinux-frame/src/arch/x86/device/pci.rs diff --git a/src/framework/jinux-frame/src/arch/x86/device/serial.rs b/framework/jinux-frame/src/arch/x86/device/serial.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/device/serial.rs rename to framework/jinux-frame/src/arch/x86/device/serial.rs diff --git a/src/framework/jinux-frame/src/arch/x86/irq.rs b/framework/jinux-frame/src/arch/x86/irq.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/irq.rs rename to framework/jinux-frame/src/arch/x86/irq.rs diff --git a/src/framework/jinux-frame/src/arch/x86/kernel/acpi.rs b/framework/jinux-frame/src/arch/x86/kernel/acpi.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/kernel/acpi.rs rename to framework/jinux-frame/src/arch/x86/kernel/acpi.rs diff --git a/src/framework/jinux-frame/src/arch/x86/kernel/ioapic.rs b/framework/jinux-frame/src/arch/x86/kernel/ioapic.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/kernel/ioapic.rs rename to framework/jinux-frame/src/arch/x86/kernel/ioapic.rs diff --git a/src/framework/jinux-frame/src/arch/x86/kernel/mod.rs b/framework/jinux-frame/src/arch/x86/kernel/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/kernel/mod.rs rename to framework/jinux-frame/src/arch/x86/kernel/mod.rs diff --git a/src/framework/jinux-frame/src/arch/x86/kernel/pic.rs b/framework/jinux-frame/src/arch/x86/kernel/pic.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/kernel/pic.rs rename to framework/jinux-frame/src/arch/x86/kernel/pic.rs diff --git a/src/framework/jinux-frame/src/arch/x86/kernel/xapic.rs b/framework/jinux-frame/src/arch/x86/kernel/xapic.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/kernel/xapic.rs rename to framework/jinux-frame/src/arch/x86/kernel/xapic.rs diff --git a/src/framework/jinux-frame/src/arch/x86/mm/mod.rs b/framework/jinux-frame/src/arch/x86/mm/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/mm/mod.rs rename to framework/jinux-frame/src/arch/x86/mm/mod.rs diff --git a/src/framework/jinux-frame/src/arch/x86/mod.rs b/framework/jinux-frame/src/arch/x86/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/mod.rs rename to framework/jinux-frame/src/arch/x86/mod.rs diff --git a/src/framework/jinux-frame/src/arch/x86/timer/apic.rs b/framework/jinux-frame/src/arch/x86/timer/apic.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/timer/apic.rs rename to framework/jinux-frame/src/arch/x86/timer/apic.rs diff --git a/src/framework/jinux-frame/src/arch/x86/timer/hpet.rs b/framework/jinux-frame/src/arch/x86/timer/hpet.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/timer/hpet.rs rename to framework/jinux-frame/src/arch/x86/timer/hpet.rs diff --git a/src/framework/jinux-frame/src/arch/x86/timer/mod.rs b/framework/jinux-frame/src/arch/x86/timer/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/timer/mod.rs rename to framework/jinux-frame/src/arch/x86/timer/mod.rs diff --git a/src/framework/jinux-frame/src/arch/x86/timer/pit.rs b/framework/jinux-frame/src/arch/x86/timer/pit.rs similarity index 100% rename from src/framework/jinux-frame/src/arch/x86/timer/pit.rs rename to framework/jinux-frame/src/arch/x86/timer/pit.rs diff --git a/src/framework/jinux-frame/src/config.rs b/framework/jinux-frame/src/config.rs similarity index 100% rename from src/framework/jinux-frame/src/config.rs rename to framework/jinux-frame/src/config.rs diff --git a/src/framework/jinux-frame/src/cpu.rs b/framework/jinux-frame/src/cpu.rs similarity index 100% rename from src/framework/jinux-frame/src/cpu.rs rename to framework/jinux-frame/src/cpu.rs diff --git a/src/framework/jinux-frame/src/error.rs b/framework/jinux-frame/src/error.rs similarity index 100% rename from src/framework/jinux-frame/src/error.rs rename to framework/jinux-frame/src/error.rs diff --git a/src/framework/jinux-frame/src/lib.rs b/framework/jinux-frame/src/lib.rs similarity index 100% rename from src/framework/jinux-frame/src/lib.rs rename to framework/jinux-frame/src/lib.rs diff --git a/src/framework/jinux-frame/src/logger.rs b/framework/jinux-frame/src/logger.rs similarity index 100% rename from src/framework/jinux-frame/src/logger.rs rename to framework/jinux-frame/src/logger.rs diff --git a/src/framework/jinux-frame/src/prelude.rs b/framework/jinux-frame/src/prelude.rs similarity index 100% rename from src/framework/jinux-frame/src/prelude.rs rename to framework/jinux-frame/src/prelude.rs diff --git a/src/framework/jinux-frame/src/sync/atomic_bits.rs b/framework/jinux-frame/src/sync/atomic_bits.rs similarity index 100% rename from src/framework/jinux-frame/src/sync/atomic_bits.rs rename to framework/jinux-frame/src/sync/atomic_bits.rs diff --git a/src/framework/jinux-frame/src/sync/mod.rs b/framework/jinux-frame/src/sync/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/sync/mod.rs rename to framework/jinux-frame/src/sync/mod.rs diff --git a/src/framework/jinux-frame/src/sync/mutex.rs b/framework/jinux-frame/src/sync/mutex.rs similarity index 100% rename from src/framework/jinux-frame/src/sync/mutex.rs rename to framework/jinux-frame/src/sync/mutex.rs diff --git a/src/framework/jinux-frame/src/sync/rcu/mod.rs b/framework/jinux-frame/src/sync/rcu/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/sync/rcu/mod.rs rename to framework/jinux-frame/src/sync/rcu/mod.rs diff --git a/src/framework/jinux-frame/src/sync/rcu/monitor.rs b/framework/jinux-frame/src/sync/rcu/monitor.rs similarity index 100% rename from src/framework/jinux-frame/src/sync/rcu/monitor.rs rename to framework/jinux-frame/src/sync/rcu/monitor.rs diff --git a/src/framework/jinux-frame/src/sync/rcu/owner_ptr.rs b/framework/jinux-frame/src/sync/rcu/owner_ptr.rs similarity index 100% rename from src/framework/jinux-frame/src/sync/rcu/owner_ptr.rs rename to framework/jinux-frame/src/sync/rcu/owner_ptr.rs diff --git a/src/framework/jinux-frame/src/sync/spin.rs b/framework/jinux-frame/src/sync/spin.rs similarity index 100% rename from src/framework/jinux-frame/src/sync/spin.rs rename to framework/jinux-frame/src/sync/spin.rs diff --git a/src/framework/jinux-frame/src/sync/wait.rs b/framework/jinux-frame/src/sync/wait.rs similarity index 100% rename from src/framework/jinux-frame/src/sync/wait.rs rename to framework/jinux-frame/src/sync/wait.rs diff --git a/src/framework/jinux-frame/src/task/mod.rs b/framework/jinux-frame/src/task/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/task/mod.rs rename to framework/jinux-frame/src/task/mod.rs diff --git a/src/framework/jinux-frame/src/task/processor.rs b/framework/jinux-frame/src/task/processor.rs similarity index 100% rename from src/framework/jinux-frame/src/task/processor.rs rename to framework/jinux-frame/src/task/processor.rs diff --git a/src/framework/jinux-frame/src/task/scheduler.rs b/framework/jinux-frame/src/task/scheduler.rs similarity index 100% rename from src/framework/jinux-frame/src/task/scheduler.rs rename to framework/jinux-frame/src/task/scheduler.rs diff --git a/src/framework/jinux-frame/src/task/switch.S b/framework/jinux-frame/src/task/switch.S similarity index 100% rename from src/framework/jinux-frame/src/task/switch.S rename to framework/jinux-frame/src/task/switch.S diff --git a/src/framework/jinux-frame/src/task/task.rs b/framework/jinux-frame/src/task/task.rs similarity index 100% rename from src/framework/jinux-frame/src/task/task.rs rename to framework/jinux-frame/src/task/task.rs diff --git a/src/framework/jinux-frame/src/timer.rs b/framework/jinux-frame/src/timer.rs similarity index 100% rename from src/framework/jinux-frame/src/timer.rs rename to framework/jinux-frame/src/timer.rs diff --git a/src/framework/jinux-frame/src/trap/handler.rs b/framework/jinux-frame/src/trap/handler.rs similarity index 100% rename from src/framework/jinux-frame/src/trap/handler.rs rename to framework/jinux-frame/src/trap/handler.rs diff --git a/src/framework/jinux-frame/src/trap/irq.rs b/framework/jinux-frame/src/trap/irq.rs similarity index 100% rename from src/framework/jinux-frame/src/trap/irq.rs rename to framework/jinux-frame/src/trap/irq.rs diff --git a/src/framework/jinux-frame/src/trap/mod.rs b/framework/jinux-frame/src/trap/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/trap/mod.rs rename to framework/jinux-frame/src/trap/mod.rs diff --git a/src/framework/jinux-frame/src/user.rs b/framework/jinux-frame/src/user.rs similarity index 100% rename from src/framework/jinux-frame/src/user.rs rename to framework/jinux-frame/src/user.rs diff --git a/src/framework/jinux-frame/src/util/mod.rs b/framework/jinux-frame/src/util/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/util/mod.rs rename to framework/jinux-frame/src/util/mod.rs diff --git a/src/framework/jinux-frame/src/util/recycle_allocator.rs b/framework/jinux-frame/src/util/recycle_allocator.rs similarity index 100% rename from src/framework/jinux-frame/src/util/recycle_allocator.rs rename to framework/jinux-frame/src/util/recycle_allocator.rs diff --git a/src/framework/jinux-frame/src/util/type_map.rs b/framework/jinux-frame/src/util/type_map.rs similarity index 100% rename from src/framework/jinux-frame/src/util/type_map.rs rename to framework/jinux-frame/src/util/type_map.rs diff --git a/src/framework/jinux-frame/src/vm/frame.rs b/framework/jinux-frame/src/vm/frame.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/frame.rs rename to framework/jinux-frame/src/vm/frame.rs diff --git a/src/framework/jinux-frame/src/vm/frame_allocator.rs b/framework/jinux-frame/src/vm/frame_allocator.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/frame_allocator.rs rename to framework/jinux-frame/src/vm/frame_allocator.rs diff --git a/src/framework/jinux-frame/src/vm/heap_allocator.rs b/framework/jinux-frame/src/vm/heap_allocator.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/heap_allocator.rs rename to framework/jinux-frame/src/vm/heap_allocator.rs diff --git a/src/framework/jinux-frame/src/vm/io.rs b/framework/jinux-frame/src/vm/io.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/io.rs rename to framework/jinux-frame/src/vm/io.rs diff --git a/src/framework/jinux-frame/src/vm/memory_set.rs b/framework/jinux-frame/src/vm/memory_set.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/memory_set.rs rename to framework/jinux-frame/src/vm/memory_set.rs diff --git a/src/framework/jinux-frame/src/vm/mod.rs b/framework/jinux-frame/src/vm/mod.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/mod.rs rename to framework/jinux-frame/src/vm/mod.rs diff --git a/src/framework/jinux-frame/src/vm/offset.rs b/framework/jinux-frame/src/vm/offset.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/offset.rs rename to framework/jinux-frame/src/vm/offset.rs diff --git a/src/framework/jinux-frame/src/vm/page_table.rs b/framework/jinux-frame/src/vm/page_table.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/page_table.rs rename to framework/jinux-frame/src/vm/page_table.rs diff --git a/src/framework/jinux-frame/src/vm/space.rs b/framework/jinux-frame/src/vm/space.rs similarity index 100% rename from src/framework/jinux-frame/src/vm/space.rs rename to framework/jinux-frame/src/vm/space.rs diff --git a/src/framework/align_ext/Cargo.toml b/framework/libs/align_ext/Cargo.toml similarity index 100% rename from src/framework/align_ext/Cargo.toml rename to framework/libs/align_ext/Cargo.toml diff --git a/src/framework/align_ext/src/lib.rs b/framework/libs/align_ext/src/lib.rs similarity index 100% rename from src/framework/align_ext/src/lib.rs rename to framework/libs/align_ext/src/lib.rs diff --git a/src/README.md b/kernel/README.md similarity index 100% rename from src/README.md rename to kernel/README.md diff --git a/src/src/main.rs b/kernel/main.rs similarity index 100% rename from src/src/main.rs rename to kernel/main.rs diff --git a/src/apps/bin/Makefile b/regression/apps/bin/Makefile similarity index 100% rename from src/apps/bin/Makefile rename to regression/apps/bin/Makefile diff --git a/src/apps/bin/sh b/regression/apps/bin/sh similarity index 100% rename from src/apps/bin/sh rename to regression/apps/bin/sh diff --git a/src/apps/busybox/README.md b/regression/apps/busybox/README.md similarity index 100% rename from src/apps/busybox/README.md rename to regression/apps/busybox/README.md diff --git a/src/apps/busybox/busybox b/regression/apps/busybox/busybox similarity index 100% rename from src/apps/busybox/busybox rename to regression/apps/busybox/busybox diff --git a/src/apps/execve/Makefile b/regression/apps/execve/Makefile similarity index 100% rename from src/apps/execve/Makefile rename to regression/apps/execve/Makefile diff --git a/src/apps/execve/execve b/regression/apps/execve/execve similarity index 100% rename from src/apps/execve/execve rename to regression/apps/execve/execve diff --git a/src/apps/execve/execve.c b/regression/apps/execve/execve.c similarity index 100% rename from src/apps/execve/execve.c rename to regression/apps/execve/execve.c diff --git a/src/apps/execve/hello b/regression/apps/execve/hello similarity index 100% rename from src/apps/execve/hello rename to regression/apps/execve/hello diff --git a/src/apps/execve/hello.c b/regression/apps/execve/hello.c similarity index 100% rename from src/apps/execve/hello.c rename to regression/apps/execve/hello.c diff --git a/src/apps/fork/Makefile b/regression/apps/fork/Makefile similarity index 100% rename from src/apps/fork/Makefile rename to regression/apps/fork/Makefile diff --git a/src/apps/fork/fork b/regression/apps/fork/fork similarity index 100% rename from src/apps/fork/fork rename to regression/apps/fork/fork diff --git a/src/apps/fork/fork.s b/regression/apps/fork/fork.s similarity index 100% rename from src/apps/fork/fork.s rename to regression/apps/fork/fork.s diff --git a/src/apps/fork_c/Makefile b/regression/apps/fork_c/Makefile similarity index 100% rename from src/apps/fork_c/Makefile rename to regression/apps/fork_c/Makefile diff --git a/src/apps/fork_c/fork b/regression/apps/fork_c/fork similarity index 100% rename from src/apps/fork_c/fork rename to regression/apps/fork_c/fork diff --git a/src/apps/fork_c/fork.c b/regression/apps/fork_c/fork.c similarity index 100% rename from src/apps/fork_c/fork.c rename to regression/apps/fork_c/fork.c diff --git a/src/apps/hello_c/Makefile b/regression/apps/hello_c/Makefile similarity index 100% rename from src/apps/hello_c/Makefile rename to regression/apps/hello_c/Makefile diff --git a/regression/apps/hello_c/hello b/regression/apps/hello_c/hello new file mode 100755 index 000000000..4db2c3de7 --- /dev/null +++ b/regression/apps/hello_c/hello @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dda5a7d6081cc2252056375d0550731ef2fd24789aa5f17da189a36bf78c588d +size 871896 diff --git a/src/apps/hello_c/hello.c b/regression/apps/hello_c/hello.c similarity index 100% rename from src/apps/hello_c/hello.c rename to regression/apps/hello_c/hello.c diff --git a/src/apps/hello_pie/Makefile b/regression/apps/hello_pie/Makefile similarity index 100% rename from src/apps/hello_pie/Makefile rename to regression/apps/hello_pie/Makefile diff --git a/src/apps/hello_pie/hello b/regression/apps/hello_pie/hello similarity index 100% rename from src/apps/hello_pie/hello rename to regression/apps/hello_pie/hello diff --git a/src/apps/hello_pie/hello.c b/regression/apps/hello_pie/hello.c similarity index 100% rename from src/apps/hello_pie/hello.c rename to regression/apps/hello_pie/hello.c diff --git a/src/apps/hello_world/Makefile b/regression/apps/hello_world/Makefile similarity index 100% rename from src/apps/hello_world/Makefile rename to regression/apps/hello_world/Makefile diff --git a/src/apps/hello_world/hello_world b/regression/apps/hello_world/hello_world similarity index 100% rename from src/apps/hello_world/hello_world rename to regression/apps/hello_world/hello_world diff --git a/src/apps/hello_world/hello_world.s b/regression/apps/hello_world/hello_world.s similarity index 100% rename from src/apps/hello_world/hello_world.s rename to regression/apps/hello_world/hello_world.s diff --git a/src/apps/pthread/Makefile b/regression/apps/pthread/Makefile similarity index 100% rename from src/apps/pthread/Makefile rename to regression/apps/pthread/Makefile diff --git a/src/apps/pthread/pthread_test b/regression/apps/pthread/pthread_test similarity index 100% rename from src/apps/pthread/pthread_test rename to regression/apps/pthread/pthread_test diff --git a/src/apps/pthread/pthread_test.c b/regression/apps/pthread/pthread_test.c similarity index 100% rename from src/apps/pthread/pthread_test.c rename to regression/apps/pthread/pthread_test.c diff --git a/src/apps/scripts/run_tests.sh b/regression/apps/scripts/run_tests.sh similarity index 100% rename from src/apps/scripts/run_tests.sh rename to regression/apps/scripts/run_tests.sh diff --git a/src/apps/scripts/test_cmd.sh b/regression/apps/scripts/test_cmd.sh similarity index 100% rename from src/apps/scripts/test_cmd.sh rename to regression/apps/scripts/test_cmd.sh diff --git a/src/apps/signal_c/Makefile b/regression/apps/signal_c/Makefile similarity index 100% rename from src/apps/signal_c/Makefile rename to regression/apps/signal_c/Makefile diff --git a/src/apps/signal_c/signal_test b/regression/apps/signal_c/signal_test similarity index 100% rename from src/apps/signal_c/signal_test rename to regression/apps/signal_c/signal_test diff --git a/src/apps/signal_c/signal_test.c b/regression/apps/signal_c/signal_test.c similarity index 100% rename from src/apps/signal_c/signal_test.c rename to regression/apps/signal_c/signal_test.c diff --git a/src/ramdisk/Makefile b/regression/ramdisk/Makefile similarity index 100% rename from src/ramdisk/Makefile rename to regression/ramdisk/Makefile diff --git a/src/ramdisk/mkinitramfs b/regression/ramdisk/mkinitramfs similarity index 100% rename from src/ramdisk/mkinitramfs rename to regression/ramdisk/mkinitramfs diff --git a/src/services/comps/block/Cargo.toml b/services/comps/block/Cargo.toml similarity index 89% rename from src/services/comps/block/Cargo.toml rename to services/comps/block/Cargo.toml index 41b617a92..d500b8c51 100644 --- a/src/services/comps/block/Cargo.toml +++ b/services/comps/block/Cargo.toml @@ -12,7 +12,7 @@ jinux-frame = { path = "../../../framework/jinux-frame" } jinux-pci = { path = "../pci" } jinux-virtio = { path = "../virtio" } jinux-util = { path = "../../libs/jinux-util" } -component = { path = "../../comp-sys/component" } +component = { path = "../../libs/comp-sys/component" } log = "0.4" [features] diff --git a/src/services/comps/block/src/lib.rs b/services/comps/block/src/lib.rs similarity index 100% rename from src/services/comps/block/src/lib.rs rename to services/comps/block/src/lib.rs diff --git a/src/services/comps/block/src/virtio.rs b/services/comps/block/src/virtio.rs similarity index 100% rename from src/services/comps/block/src/virtio.rs rename to services/comps/block/src/virtio.rs diff --git a/src/services/comps/framebuffer/Cargo.toml b/services/comps/framebuffer/Cargo.toml similarity index 87% rename from src/services/comps/framebuffer/Cargo.toml rename to services/comps/framebuffer/Cargo.toml index c352813d7..623734d41 100644 --- a/src/services/comps/framebuffer/Cargo.toml +++ b/services/comps/framebuffer/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] jinux-frame = { path = "../../../framework/jinux-frame" } -component = { path = "../../comp-sys/component" } +component = { path = "../../libs/comp-sys/component" } log = "0.4" spin = "0.9.4" font8x8 = { version = "0.2.5", default-features = false, features = [ diff --git a/src/services/comps/framebuffer/src/lib.rs b/services/comps/framebuffer/src/lib.rs similarity index 100% rename from src/services/comps/framebuffer/src/lib.rs rename to services/comps/framebuffer/src/lib.rs diff --git a/src/services/comps/input/Cargo.toml b/services/comps/input/Cargo.toml similarity index 90% rename from src/services/comps/input/Cargo.toml rename to services/comps/input/Cargo.toml index 1753c6de0..0f0c37816 100644 --- a/src/services/comps/input/Cargo.toml +++ b/services/comps/input/Cargo.toml @@ -12,7 +12,7 @@ jinux-frame = { path = "../../../framework/jinux-frame" } jinux-pci = { path = "../pci" } jinux-virtio = { path = "../virtio" } jinux-util = { path = "../../libs/jinux-util" } -component = { path = "../../comp-sys/component" } +component = { path = "../../libs/comp-sys/component" } virtio-input-decoder = "0.1.4" log = "0.4" diff --git a/src/services/comps/input/src/lib.rs b/services/comps/input/src/lib.rs similarity index 100% rename from src/services/comps/input/src/lib.rs rename to services/comps/input/src/lib.rs diff --git a/src/services/comps/input/src/virtio.rs b/services/comps/input/src/virtio.rs similarity index 100% rename from src/services/comps/input/src/virtio.rs rename to services/comps/input/src/virtio.rs diff --git a/src/services/comps/pci/Cargo.toml b/services/comps/pci/Cargo.toml similarity index 89% rename from src/services/comps/pci/Cargo.toml rename to services/comps/pci/Cargo.toml index 15ff93b69..70bb4672b 100644 --- a/src/services/comps/pci/Cargo.toml +++ b/services/comps/pci/Cargo.toml @@ -11,7 +11,7 @@ spin = "0.9.4" jinux-frame = { path = "../../../framework/jinux-frame" } jinux-util = { path = "../../libs/jinux-util" } pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } -component = { path = "../../comp-sys/component" } +component = { path = "../../libs/comp-sys/component" } log = "0.4" [dependencies.lazy_static] diff --git a/src/services/comps/pci/src/capability/exp.rs b/services/comps/pci/src/capability/exp.rs similarity index 100% rename from src/services/comps/pci/src/capability/exp.rs rename to services/comps/pci/src/capability/exp.rs diff --git a/src/services/comps/pci/src/capability/mod.rs b/services/comps/pci/src/capability/mod.rs similarity index 100% rename from src/services/comps/pci/src/capability/mod.rs rename to services/comps/pci/src/capability/mod.rs diff --git a/src/services/comps/pci/src/capability/msi.rs b/services/comps/pci/src/capability/msi.rs similarity index 100% rename from src/services/comps/pci/src/capability/msi.rs rename to services/comps/pci/src/capability/msi.rs diff --git a/src/services/comps/pci/src/capability/msix.rs b/services/comps/pci/src/capability/msix.rs similarity index 100% rename from src/services/comps/pci/src/capability/msix.rs rename to services/comps/pci/src/capability/msix.rs diff --git a/src/services/comps/pci/src/capability/pm.rs b/services/comps/pci/src/capability/pm.rs similarity index 100% rename from src/services/comps/pci/src/capability/pm.rs rename to services/comps/pci/src/capability/pm.rs diff --git a/src/services/comps/pci/src/capability/sata.rs b/services/comps/pci/src/capability/sata.rs similarity index 100% rename from src/services/comps/pci/src/capability/sata.rs rename to services/comps/pci/src/capability/sata.rs diff --git a/src/services/comps/pci/src/capability/vendor/mod.rs b/services/comps/pci/src/capability/vendor/mod.rs similarity index 100% rename from src/services/comps/pci/src/capability/vendor/mod.rs rename to services/comps/pci/src/capability/vendor/mod.rs diff --git a/src/services/comps/pci/src/capability/vendor/virtio.rs b/services/comps/pci/src/capability/vendor/virtio.rs similarity index 100% rename from src/services/comps/pci/src/capability/vendor/virtio.rs rename to services/comps/pci/src/capability/vendor/virtio.rs diff --git a/src/services/comps/pci/src/lib.rs b/services/comps/pci/src/lib.rs similarity index 100% rename from src/services/comps/pci/src/lib.rs rename to services/comps/pci/src/lib.rs diff --git a/src/services/comps/pci/src/msix.rs b/services/comps/pci/src/msix.rs similarity index 100% rename from src/services/comps/pci/src/msix.rs rename to services/comps/pci/src/msix.rs diff --git a/src/services/comps/pci/src/util.rs b/services/comps/pci/src/util.rs similarity index 100% rename from src/services/comps/pci/src/util.rs rename to services/comps/pci/src/util.rs diff --git a/src/services/comps/time/Cargo.toml b/services/comps/time/Cargo.toml similarity index 83% rename from src/services/comps/time/Cargo.toml rename to services/comps/time/Cargo.toml index 24cc2b9d0..9bd5822a6 100644 --- a/src/services/comps/time/Cargo.toml +++ b/services/comps/time/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] jinux-frame = { path = "../../../framework/jinux-frame" } -component = { path = "../../comp-sys/component" } +component = { path = "../../libs/comp-sys/component" } log = "0.4" spin = "0.9.4" diff --git a/src/services/comps/time/src/lib.rs b/services/comps/time/src/lib.rs similarity index 100% rename from src/services/comps/time/src/lib.rs rename to services/comps/time/src/lib.rs diff --git a/src/services/comps/time/src/rtc.rs b/services/comps/time/src/rtc.rs similarity index 100% rename from src/services/comps/time/src/rtc.rs rename to services/comps/time/src/rtc.rs diff --git a/src/services/comps/virtio/Cargo.toml b/services/comps/virtio/Cargo.toml similarity index 89% rename from src/services/comps/virtio/Cargo.toml rename to services/comps/virtio/Cargo.toml index e69430268..11546d501 100644 --- a/src/services/comps/virtio/Cargo.toml +++ b/services/comps/virtio/Cargo.toml @@ -12,7 +12,7 @@ jinux-frame = { path = "../../../framework/jinux-frame" } jinux-pci = { path = "../pci" } jinux-util = { path = "../../libs/jinux-util" } pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } -component = { path = "../../comp-sys/component" } +component = { path = "../../libs/comp-sys/component" } log = "0.4" [features] diff --git a/src/services/comps/virtio/src/device/block/device.rs b/services/comps/virtio/src/device/block/device.rs similarity index 100% rename from src/services/comps/virtio/src/device/block/device.rs rename to services/comps/virtio/src/device/block/device.rs diff --git a/src/services/comps/virtio/src/device/block/mod.rs b/services/comps/virtio/src/device/block/mod.rs similarity index 100% rename from src/services/comps/virtio/src/device/block/mod.rs rename to services/comps/virtio/src/device/block/mod.rs diff --git a/src/services/comps/virtio/src/device/input/device.rs b/services/comps/virtio/src/device/input/device.rs similarity index 100% rename from src/services/comps/virtio/src/device/input/device.rs rename to services/comps/virtio/src/device/input/device.rs diff --git a/src/services/comps/virtio/src/device/input/mod.rs b/services/comps/virtio/src/device/input/mod.rs similarity index 100% rename from src/services/comps/virtio/src/device/input/mod.rs rename to services/comps/virtio/src/device/input/mod.rs diff --git a/src/services/comps/virtio/src/device/mod.rs b/services/comps/virtio/src/device/mod.rs similarity index 100% rename from src/services/comps/virtio/src/device/mod.rs rename to services/comps/virtio/src/device/mod.rs diff --git a/src/services/comps/virtio/src/lib.rs b/services/comps/virtio/src/lib.rs similarity index 100% rename from src/services/comps/virtio/src/lib.rs rename to services/comps/virtio/src/lib.rs diff --git a/src/services/comps/virtio/src/queue.rs b/services/comps/virtio/src/queue.rs similarity index 100% rename from src/services/comps/virtio/src/queue.rs rename to services/comps/virtio/src/queue.rs diff --git a/src/services/comp-sys/cargo-component/.gitignore b/services/libs/comp-sys/cargo-component/.gitignore similarity index 100% rename from src/services/comp-sys/cargo-component/.gitignore rename to services/libs/comp-sys/cargo-component/.gitignore diff --git a/src/services/comp-sys/cargo-component/Cargo.lock b/services/libs/comp-sys/cargo-component/Cargo.lock similarity index 100% rename from src/services/comp-sys/cargo-component/Cargo.lock rename to services/libs/comp-sys/cargo-component/Cargo.lock diff --git a/src/services/comp-sys/cargo-component/Cargo.toml b/services/libs/comp-sys/cargo-component/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/Cargo.toml rename to services/libs/comp-sys/cargo-component/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/README.md b/services/libs/comp-sys/cargo-component/README.md similarity index 100% rename from src/services/comp-sys/cargo-component/README.md rename to services/libs/comp-sys/cargo-component/README.md diff --git a/src/services/comp-sys/cargo-component/analysis/Cargo.toml b/services/libs/comp-sys/cargo-component/analysis/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/analysis/Cargo.toml rename to services/libs/comp-sys/cargo-component/analysis/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/analysis/src/conf.rs b/services/libs/comp-sys/cargo-component/analysis/src/conf.rs similarity index 100% rename from src/services/comp-sys/cargo-component/analysis/src/conf.rs rename to services/libs/comp-sys/cargo-component/analysis/src/conf.rs diff --git a/src/services/comp-sys/cargo-component/analysis/src/lib.rs b/services/libs/comp-sys/cargo-component/analysis/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/analysis/src/lib.rs rename to services/libs/comp-sys/cargo-component/analysis/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/build.rs b/services/libs/comp-sys/cargo-component/build.rs similarity index 100% rename from src/services/comp-sys/cargo-component/build.rs rename to services/libs/comp-sys/cargo-component/build.rs diff --git a/src/services/comp-sys/cargo-component/rust-toolchain.toml b/services/libs/comp-sys/cargo-component/rust-toolchain.toml similarity index 100% rename from src/services/comp-sys/cargo-component/rust-toolchain.toml rename to services/libs/comp-sys/cargo-component/rust-toolchain.toml diff --git a/src/services/comp-sys/cargo-component/src/driver.rs b/services/libs/comp-sys/cargo-component/src/driver.rs similarity index 100% rename from src/services/comp-sys/cargo-component/src/driver.rs rename to services/libs/comp-sys/cargo-component/src/driver.rs diff --git a/src/services/comp-sys/cargo-component/src/main.rs b/services/libs/comp-sys/cargo-component/src/main.rs similarity index 100% rename from src/services/comp-sys/cargo-component/src/main.rs rename to services/libs/comp-sys/cargo-component/src/main.rs diff --git a/src/services/comp-sys/cargo-component/tests/duplicate_lib_name.rs b/services/libs/comp-sys/cargo-component/tests/duplicate_lib_name.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/duplicate_lib_name.rs rename to services/libs/comp-sys/cargo-component/tests/duplicate_lib_name.rs diff --git a/src/services/comp-sys/cargo-component/tests/duplicate_lib_name_test/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/duplicate_lib_name_test/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/duplicate_lib_name_test/Components.toml b/services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Components.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/duplicate_lib_name_test/Components.toml rename to services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Components.toml diff --git a/src/services/comp-sys/cargo-component/tests/duplicate_lib_name_test/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/duplicate_lib_name_test/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/missing_toml.rs b/services/libs/comp-sys/cargo-component/tests/missing_toml.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/missing_toml.rs rename to services/libs/comp-sys/cargo-component/tests/missing_toml.rs diff --git a/src/services/comp-sys/cargo-component/tests/missing_toml_test/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/missing_toml_test/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/missing_toml_test/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/missing_toml_test/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/missing_toml_test/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/missing_toml_test/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/missing_toml_test/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/missing_toml_test/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/reexport.rs b/services/libs/comp-sys/cargo-component/tests/reexport.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport.rs rename to services/libs/comp-sys/cargo-component/tests/reexport.rs diff --git a/src/services/comp-sys/cargo-component/tests/reexport_test/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/reexport_test/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport_test/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/reexport_test/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/reexport_test/Components.toml b/services/libs/comp-sys/cargo-component/tests/reexport_test/Components.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport_test/Components.toml rename to services/libs/comp-sys/cargo-component/tests/reexport_test/Components.toml diff --git a/src/services/comp-sys/cargo-component/tests/reexport_test/bar/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/reexport_test/bar/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport_test/bar/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/reexport_test/bar/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/reexport_test/bar/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/reexport_test/bar/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport_test/bar/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/reexport_test/bar/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/reexport_test/baz/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/reexport_test/baz/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport_test/baz/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/reexport_test/baz/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/reexport_test/baz/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/reexport_test/baz/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport_test/baz/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/reexport_test/baz/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/reexport_test/foo/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/reexport_test/foo/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport_test/foo/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/reexport_test/foo/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/reexport_test/foo/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/reexport_test/foo/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/reexport_test/foo/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/reexport_test/foo/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/regression.rs b/services/libs/comp-sys/cargo-component/tests/regression.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/regression.rs rename to services/libs/comp-sys/cargo-component/tests/regression.rs diff --git a/src/services/comp-sys/cargo-component/tests/regression_test/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/regression_test/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/regression_test/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/regression_test/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/regression_test/Components.toml b/services/libs/comp-sys/cargo-component/tests/regression_test/Components.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/regression_test/Components.toml rename to services/libs/comp-sys/cargo-component/tests/regression_test/Components.toml diff --git a/src/services/comp-sys/cargo-component/tests/regression_test/bar/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/regression_test/bar/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/regression_test/bar/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/regression_test/bar/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/regression_test/bar/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/regression_test/bar/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/regression_test/bar/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/regression_test/bar/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/regression_test/foo/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/regression_test/foo/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/regression_test/foo/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/regression_test/foo/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/regression_test/foo/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/regression_test/foo/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/regression_test/foo/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/regression_test/foo/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/test_utils/mod.rs b/services/libs/comp-sys/cargo-component/tests/test_utils/mod.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/test_utils/mod.rs rename to services/libs/comp-sys/cargo-component/tests/test_utils/mod.rs diff --git a/src/services/comp-sys/cargo-component/tests/trait_method.rs b/services/libs/comp-sys/cargo-component/tests/trait_method.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/trait_method.rs rename to services/libs/comp-sys/cargo-component/tests/trait_method.rs diff --git a/src/services/comp-sys/cargo-component/tests/trait_method_test/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/trait_method_test/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/trait_method_test/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/trait_method_test/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/trait_method_test/Components.toml b/services/libs/comp-sys/cargo-component/tests/trait_method_test/Components.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/trait_method_test/Components.toml rename to services/libs/comp-sys/cargo-component/tests/trait_method_test/Components.toml diff --git a/src/services/comp-sys/cargo-component/tests/trait_method_test/bar/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/trait_method_test/bar/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/trait_method_test/bar/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/trait_method_test/bar/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/trait_method_test/bar/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/trait_method_test/bar/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/trait_method_test/bar/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/trait_method_test/bar/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/trait_method_test/foo/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/trait_method_test/foo/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/trait_method_test/foo/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/trait_method_test/foo/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/trait_method_test/foo/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/trait_method_test/foo/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/trait_method_test/foo/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/trait_method_test/foo/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/violate_policy.rs b/services/libs/comp-sys/cargo-component/tests/violate_policy.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/violate_policy.rs rename to services/libs/comp-sys/cargo-component/tests/violate_policy.rs diff --git a/src/services/comp-sys/cargo-component/tests/violate_policy_test/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/violate_policy_test/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/violate_policy_test/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/violate_policy_test/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/violate_policy_test/Components.toml b/services/libs/comp-sys/cargo-component/tests/violate_policy_test/Components.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/violate_policy_test/Components.toml rename to services/libs/comp-sys/cargo-component/tests/violate_policy_test/Components.toml diff --git a/src/services/comp-sys/cargo-component/tests/violate_policy_test/bar/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/violate_policy_test/bar/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/violate_policy_test/bar/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/violate_policy_test/bar/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/violate_policy_test/bar/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/violate_policy_test/bar/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/violate_policy_test/bar/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/violate_policy_test/bar/src/lib.rs diff --git a/src/services/comp-sys/cargo-component/tests/violate_policy_test/foo/Cargo.toml b/services/libs/comp-sys/cargo-component/tests/violate_policy_test/foo/Cargo.toml similarity index 100% rename from src/services/comp-sys/cargo-component/tests/violate_policy_test/foo/Cargo.toml rename to services/libs/comp-sys/cargo-component/tests/violate_policy_test/foo/Cargo.toml diff --git a/src/services/comp-sys/cargo-component/tests/violate_policy_test/foo/src/lib.rs b/services/libs/comp-sys/cargo-component/tests/violate_policy_test/foo/src/lib.rs similarity index 100% rename from src/services/comp-sys/cargo-component/tests/violate_policy_test/foo/src/lib.rs rename to services/libs/comp-sys/cargo-component/tests/violate_policy_test/foo/src/lib.rs diff --git a/src/services/comp-sys/component-macro/Cargo.toml b/services/libs/comp-sys/component-macro/Cargo.toml similarity index 100% rename from src/services/comp-sys/component-macro/Cargo.toml rename to services/libs/comp-sys/component-macro/Cargo.toml diff --git a/src/services/comp-sys/component-macro/src/init_comp.rs b/services/libs/comp-sys/component-macro/src/init_comp.rs similarity index 100% rename from src/services/comp-sys/component-macro/src/init_comp.rs rename to services/libs/comp-sys/component-macro/src/init_comp.rs diff --git a/src/services/comp-sys/component-macro/src/lib.rs b/services/libs/comp-sys/component-macro/src/lib.rs similarity index 100% rename from src/services/comp-sys/component-macro/src/lib.rs rename to services/libs/comp-sys/component-macro/src/lib.rs diff --git a/src/services/comp-sys/component-macro/src/priority.rs b/services/libs/comp-sys/component-macro/src/priority.rs similarity index 100% rename from src/services/comp-sys/component-macro/src/priority.rs rename to services/libs/comp-sys/component-macro/src/priority.rs diff --git a/src/services/comp-sys/component/Cargo.toml b/services/libs/comp-sys/component/Cargo.toml similarity index 100% rename from src/services/comp-sys/component/Cargo.toml rename to services/libs/comp-sys/component/Cargo.toml diff --git a/src/services/comp-sys/component/README.md b/services/libs/comp-sys/component/README.md similarity index 100% rename from src/services/comp-sys/component/README.md rename to services/libs/comp-sys/component/README.md diff --git a/src/services/comp-sys/component/src/lib.rs b/services/libs/comp-sys/component/src/lib.rs similarity index 100% rename from src/services/comp-sys/component/src/lib.rs rename to services/libs/comp-sys/component/src/lib.rs diff --git a/src/services/comp-sys/component/tests/init-order/Cargo.toml b/services/libs/comp-sys/component/tests/init-order/Cargo.toml similarity index 100% rename from src/services/comp-sys/component/tests/init-order/Cargo.toml rename to services/libs/comp-sys/component/tests/init-order/Cargo.toml diff --git a/src/services/comp-sys/component/tests/init-order/Components.toml b/services/libs/comp-sys/component/tests/init-order/Components.toml similarity index 100% rename from src/services/comp-sys/component/tests/init-order/Components.toml rename to services/libs/comp-sys/component/tests/init-order/Components.toml diff --git a/src/services/comp-sys/component/tests/init-order/first-init/Cargo.toml b/services/libs/comp-sys/component/tests/init-order/first-init/Cargo.toml similarity index 100% rename from src/services/comp-sys/component/tests/init-order/first-init/Cargo.toml rename to services/libs/comp-sys/component/tests/init-order/first-init/Cargo.toml diff --git a/src/services/comp-sys/component/tests/init-order/first-init/src/lib.rs b/services/libs/comp-sys/component/tests/init-order/first-init/src/lib.rs similarity index 100% rename from src/services/comp-sys/component/tests/init-order/first-init/src/lib.rs rename to services/libs/comp-sys/component/tests/init-order/first-init/src/lib.rs diff --git a/src/services/comp-sys/component/tests/init-order/second-init/Cargo.toml b/services/libs/comp-sys/component/tests/init-order/second-init/Cargo.toml similarity index 100% rename from src/services/comp-sys/component/tests/init-order/second-init/Cargo.toml rename to services/libs/comp-sys/component/tests/init-order/second-init/Cargo.toml diff --git a/src/services/comp-sys/component/tests/init-order/second-init/src/lib.rs b/services/libs/comp-sys/component/tests/init-order/second-init/src/lib.rs similarity index 100% rename from src/services/comp-sys/component/tests/init-order/second-init/src/lib.rs rename to services/libs/comp-sys/component/tests/init-order/second-init/src/lib.rs diff --git a/src/services/comp-sys/component/tests/init-order/second-init/tests/test.rs b/services/libs/comp-sys/component/tests/init-order/second-init/tests/test.rs similarity index 100% rename from src/services/comp-sys/component/tests/init-order/second-init/tests/test.rs rename to services/libs/comp-sys/component/tests/init-order/second-init/tests/test.rs diff --git a/src/services/comp-sys/component/tests/init-order/src/main.rs b/services/libs/comp-sys/component/tests/init-order/src/main.rs similarity index 100% rename from src/services/comp-sys/component/tests/init-order/src/main.rs rename to services/libs/comp-sys/component/tests/init-order/src/main.rs diff --git a/src/services/comp-sys/component/tests/init-order/tests/test.rs b/services/libs/comp-sys/component/tests/init-order/tests/test.rs similarity index 100% rename from src/services/comp-sys/component/tests/init-order/tests/test.rs rename to services/libs/comp-sys/component/tests/init-order/tests/test.rs diff --git a/src/services/comp-sys/controlled/Cargo.toml b/services/libs/comp-sys/controlled/Cargo.toml similarity index 100% rename from src/services/comp-sys/controlled/Cargo.toml rename to services/libs/comp-sys/controlled/Cargo.toml diff --git a/src/services/comp-sys/controlled/src/lib.rs b/services/libs/comp-sys/controlled/src/lib.rs similarity index 100% rename from src/services/comp-sys/controlled/src/lib.rs rename to services/libs/comp-sys/controlled/src/lib.rs diff --git a/src/services/libs/cpio-decoder/Cargo.toml b/services/libs/cpio-decoder/Cargo.toml similarity index 100% rename from src/services/libs/cpio-decoder/Cargo.toml rename to services/libs/cpio-decoder/Cargo.toml diff --git a/src/services/libs/cpio-decoder/src/error.rs b/services/libs/cpio-decoder/src/error.rs similarity index 100% rename from src/services/libs/cpio-decoder/src/error.rs rename to services/libs/cpio-decoder/src/error.rs diff --git a/src/services/libs/cpio-decoder/src/lib.rs b/services/libs/cpio-decoder/src/lib.rs similarity index 100% rename from src/services/libs/cpio-decoder/src/lib.rs rename to services/libs/cpio-decoder/src/lib.rs diff --git a/src/services/libs/cpio-decoder/src/test.rs b/services/libs/cpio-decoder/src/test.rs similarity index 100% rename from src/services/libs/cpio-decoder/src/test.rs rename to services/libs/cpio-decoder/src/test.rs diff --git a/src/services/libs/jinux-rights-proc/Cargo.toml b/services/libs/jinux-rights-proc/Cargo.toml similarity index 100% rename from src/services/libs/jinux-rights-proc/Cargo.toml rename to services/libs/jinux-rights-proc/Cargo.toml diff --git a/src/services/libs/jinux-rights-proc/src/lib.rs b/services/libs/jinux-rights-proc/src/lib.rs similarity index 100% rename from src/services/libs/jinux-rights-proc/src/lib.rs rename to services/libs/jinux-rights-proc/src/lib.rs diff --git a/src/services/libs/jinux-rights-proc/src/require_attr.rs b/services/libs/jinux-rights-proc/src/require_attr.rs similarity index 100% rename from src/services/libs/jinux-rights-proc/src/require_attr.rs rename to services/libs/jinux-rights-proc/src/require_attr.rs diff --git a/src/services/libs/jinux-std/Cargo.toml b/services/libs/jinux-std/Cargo.toml similarity index 91% rename from src/services/libs/jinux-std/Cargo.toml rename to services/libs/jinux-std/Cargo.toml index 52b286156..06d3a2fa5 100644 --- a/src/services/libs/jinux-std/Cargo.toml +++ b/services/libs/jinux-std/Cargo.toml @@ -7,12 +7,12 @@ edition = "2021" [dependencies] jinux-frame = { path = "../../../framework/jinux-frame" } -align_ext = { path = "../../../framework/align_ext" } +align_ext = { path = "../../../framework/libs/align_ext" } pod = { git = "https://github.com/jinzhao-dev/pod", rev = "7fa2ed2" } jinux-input = { path = "../../comps/input" } jinux-block = { path = "../../comps/block" } jinux-time = { path = "../../comps/time" } -controlled = { path = "../../comp-sys/controlled" } +controlled = { path = "../../libs/comp-sys/controlled" } typeflags = { path = "../typeflags" } typeflags-util = { path = "../typeflags-util" } jinux-rights-proc = { path = "../jinux-rights-proc" } diff --git a/src/services/libs/jinux-std/src/driver/mod.rs b/services/libs/jinux-std/src/driver/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/driver/mod.rs rename to services/libs/jinux-std/src/driver/mod.rs diff --git a/src/services/libs/jinux-std/src/driver/tty.rs b/services/libs/jinux-std/src/driver/tty.rs similarity index 100% rename from src/services/libs/jinux-std/src/driver/tty.rs rename to services/libs/jinux-std/src/driver/tty.rs diff --git a/src/services/libs/jinux-std/src/error.rs b/services/libs/jinux-std/src/error.rs similarity index 100% rename from src/services/libs/jinux-std/src/error.rs rename to services/libs/jinux-std/src/error.rs diff --git a/src/services/libs/jinux-std/src/events/events.rs b/services/libs/jinux-std/src/events/events.rs similarity index 100% rename from src/services/libs/jinux-std/src/events/events.rs rename to services/libs/jinux-std/src/events/events.rs diff --git a/src/services/libs/jinux-std/src/events/mod.rs b/services/libs/jinux-std/src/events/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/events/mod.rs rename to services/libs/jinux-std/src/events/mod.rs diff --git a/src/services/libs/jinux-std/src/events/observer.rs b/services/libs/jinux-std/src/events/observer.rs similarity index 100% rename from src/services/libs/jinux-std/src/events/observer.rs rename to services/libs/jinux-std/src/events/observer.rs diff --git a/src/services/libs/jinux-std/src/events/subject.rs b/services/libs/jinux-std/src/events/subject.rs similarity index 100% rename from src/services/libs/jinux-std/src/events/subject.rs rename to services/libs/jinux-std/src/events/subject.rs diff --git a/src/services/libs/jinux-std/src/fs/file_handle/file.rs b/services/libs/jinux-std/src/fs/file_handle/file.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/file_handle/file.rs rename to services/libs/jinux-std/src/fs/file_handle/file.rs diff --git a/src/services/libs/jinux-std/src/fs/file_handle/inode_handle/dyn_cap.rs b/services/libs/jinux-std/src/fs/file_handle/inode_handle/dyn_cap.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/file_handle/inode_handle/dyn_cap.rs rename to services/libs/jinux-std/src/fs/file_handle/inode_handle/dyn_cap.rs diff --git a/src/services/libs/jinux-std/src/fs/file_handle/inode_handle/mod.rs b/services/libs/jinux-std/src/fs/file_handle/inode_handle/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/file_handle/inode_handle/mod.rs rename to services/libs/jinux-std/src/fs/file_handle/inode_handle/mod.rs diff --git a/src/services/libs/jinux-std/src/fs/file_handle/inode_handle/static_cap.rs b/services/libs/jinux-std/src/fs/file_handle/inode_handle/static_cap.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/file_handle/inode_handle/static_cap.rs rename to services/libs/jinux-std/src/fs/file_handle/inode_handle/static_cap.rs diff --git a/src/services/libs/jinux-std/src/fs/file_handle/mod.rs b/services/libs/jinux-std/src/fs/file_handle/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/file_handle/mod.rs rename to services/libs/jinux-std/src/fs/file_handle/mod.rs diff --git a/src/services/libs/jinux-std/src/fs/file_table.rs b/services/libs/jinux-std/src/fs/file_table.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/file_table.rs rename to services/libs/jinux-std/src/fs/file_table.rs diff --git a/src/services/libs/jinux-std/src/fs/fs_resolver.rs b/services/libs/jinux-std/src/fs/fs_resolver.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/fs_resolver.rs rename to services/libs/jinux-std/src/fs/fs_resolver.rs diff --git a/src/services/libs/jinux-std/src/fs/initramfs.rs b/services/libs/jinux-std/src/fs/initramfs.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/initramfs.rs rename to services/libs/jinux-std/src/fs/initramfs.rs diff --git a/src/services/libs/jinux-std/src/fs/mod.rs b/services/libs/jinux-std/src/fs/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/mod.rs rename to services/libs/jinux-std/src/fs/mod.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/mod.rs b/services/libs/jinux-std/src/fs/procfs/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/mod.rs rename to services/libs/jinux-std/src/fs/procfs/mod.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/pid/comm.rs b/services/libs/jinux-std/src/fs/procfs/pid/comm.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/pid/comm.rs rename to services/libs/jinux-std/src/fs/procfs/pid/comm.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/pid/exe.rs b/services/libs/jinux-std/src/fs/procfs/pid/exe.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/pid/exe.rs rename to services/libs/jinux-std/src/fs/procfs/pid/exe.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/pid/fd.rs b/services/libs/jinux-std/src/fs/procfs/pid/fd.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/pid/fd.rs rename to services/libs/jinux-std/src/fs/procfs/pid/fd.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/pid/mod.rs b/services/libs/jinux-std/src/fs/procfs/pid/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/pid/mod.rs rename to services/libs/jinux-std/src/fs/procfs/pid/mod.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/self_.rs b/services/libs/jinux-std/src/fs/procfs/self_.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/self_.rs rename to services/libs/jinux-std/src/fs/procfs/self_.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/template/builder.rs b/services/libs/jinux-std/src/fs/procfs/template/builder.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/template/builder.rs rename to services/libs/jinux-std/src/fs/procfs/template/builder.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/template/dir.rs b/services/libs/jinux-std/src/fs/procfs/template/dir.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/template/dir.rs rename to services/libs/jinux-std/src/fs/procfs/template/dir.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/template/file.rs b/services/libs/jinux-std/src/fs/procfs/template/file.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/template/file.rs rename to services/libs/jinux-std/src/fs/procfs/template/file.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/template/mod.rs b/services/libs/jinux-std/src/fs/procfs/template/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/template/mod.rs rename to services/libs/jinux-std/src/fs/procfs/template/mod.rs diff --git a/src/services/libs/jinux-std/src/fs/procfs/template/sym.rs b/services/libs/jinux-std/src/fs/procfs/template/sym.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/procfs/template/sym.rs rename to services/libs/jinux-std/src/fs/procfs/template/sym.rs diff --git a/src/services/libs/jinux-std/src/fs/ramfs/fs.rs b/services/libs/jinux-std/src/fs/ramfs/fs.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/ramfs/fs.rs rename to services/libs/jinux-std/src/fs/ramfs/fs.rs diff --git a/src/services/libs/jinux-std/src/fs/ramfs/mod.rs b/services/libs/jinux-std/src/fs/ramfs/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/ramfs/mod.rs rename to services/libs/jinux-std/src/fs/ramfs/mod.rs diff --git a/src/services/libs/jinux-std/src/fs/stdio.rs b/services/libs/jinux-std/src/fs/stdio.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/stdio.rs rename to services/libs/jinux-std/src/fs/stdio.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/access_mode.rs b/services/libs/jinux-std/src/fs/utils/access_mode.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/access_mode.rs rename to services/libs/jinux-std/src/fs/utils/access_mode.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/creation_flags.rs b/services/libs/jinux-std/src/fs/utils/creation_flags.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/creation_flags.rs rename to services/libs/jinux-std/src/fs/utils/creation_flags.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/dentry_cache.rs b/services/libs/jinux-std/src/fs/utils/dentry_cache.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/dentry_cache.rs rename to services/libs/jinux-std/src/fs/utils/dentry_cache.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/dirent_visitor.rs b/services/libs/jinux-std/src/fs/utils/dirent_visitor.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/dirent_visitor.rs rename to services/libs/jinux-std/src/fs/utils/dirent_visitor.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/direntry_vec.rs b/services/libs/jinux-std/src/fs/utils/direntry_vec.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/direntry_vec.rs rename to services/libs/jinux-std/src/fs/utils/direntry_vec.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/fcntl.rs b/services/libs/jinux-std/src/fs/utils/fcntl.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/fcntl.rs rename to services/libs/jinux-std/src/fs/utils/fcntl.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/file_creation_mask.rs b/services/libs/jinux-std/src/fs/utils/file_creation_mask.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/file_creation_mask.rs rename to services/libs/jinux-std/src/fs/utils/file_creation_mask.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/fs.rs b/services/libs/jinux-std/src/fs/utils/fs.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/fs.rs rename to services/libs/jinux-std/src/fs/utils/fs.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/inode.rs b/services/libs/jinux-std/src/fs/utils/inode.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/inode.rs rename to services/libs/jinux-std/src/fs/utils/inode.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/io_events.rs b/services/libs/jinux-std/src/fs/utils/io_events.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/io_events.rs rename to services/libs/jinux-std/src/fs/utils/io_events.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/ioctl.rs b/services/libs/jinux-std/src/fs/utils/ioctl.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/ioctl.rs rename to services/libs/jinux-std/src/fs/utils/ioctl.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/mod.rs b/services/libs/jinux-std/src/fs/utils/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/mod.rs rename to services/libs/jinux-std/src/fs/utils/mod.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/page_cache.rs b/services/libs/jinux-std/src/fs/utils/page_cache.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/page_cache.rs rename to services/libs/jinux-std/src/fs/utils/page_cache.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/poll.rs b/services/libs/jinux-std/src/fs/utils/poll.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/poll.rs rename to services/libs/jinux-std/src/fs/utils/poll.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/status_flags.rs b/services/libs/jinux-std/src/fs/utils/status_flags.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/status_flags.rs rename to services/libs/jinux-std/src/fs/utils/status_flags.rs diff --git a/src/services/libs/jinux-std/src/fs/utils/vnode.rs b/services/libs/jinux-std/src/fs/utils/vnode.rs similarity index 100% rename from src/services/libs/jinux-std/src/fs/utils/vnode.rs rename to services/libs/jinux-std/src/fs/utils/vnode.rs diff --git a/src/services/libs/jinux-std/src/lib.rs b/services/libs/jinux-std/src/lib.rs similarity index 97% rename from src/services/libs/jinux-std/src/lib.rs rename to services/libs/jinux-std/src/lib.rs index 8338214ef..905cdd18e 100644 --- a/src/services/libs/jinux-std/src/lib.rs +++ b/services/libs/jinux-std/src/lib.rs @@ -79,7 +79,7 @@ fn init_thread() { } fn read_ramdisk_content() -> &'static [u8] { - include_bytes!("../../../../ramdisk/build/ramdisk.cpio") + include_bytes!("../../../../regression/ramdisk/build/ramdisk.cpio") } /// first process never return diff --git a/src/services/libs/jinux-std/src/prelude.rs b/services/libs/jinux-std/src/prelude.rs similarity index 100% rename from src/services/libs/jinux-std/src/prelude.rs rename to services/libs/jinux-std/src/prelude.rs diff --git a/src/services/libs/jinux-std/src/process/clone.rs b/services/libs/jinux-std/src/process/clone.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/clone.rs rename to services/libs/jinux-std/src/process/clone.rs diff --git a/src/services/libs/jinux-std/src/process/fifo_scheduler.rs b/services/libs/jinux-std/src/process/fifo_scheduler.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/fifo_scheduler.rs rename to services/libs/jinux-std/src/process/fifo_scheduler.rs diff --git a/src/services/libs/jinux-std/src/process/mod.rs b/services/libs/jinux-std/src/process/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/mod.rs rename to services/libs/jinux-std/src/process/mod.rs diff --git a/src/services/libs/jinux-std/src/process/posix_thread/builder.rs b/services/libs/jinux-std/src/process/posix_thread/builder.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/posix_thread/builder.rs rename to services/libs/jinux-std/src/process/posix_thread/builder.rs diff --git a/src/services/libs/jinux-std/src/process/posix_thread/futex.rs b/services/libs/jinux-std/src/process/posix_thread/futex.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/posix_thread/futex.rs rename to services/libs/jinux-std/src/process/posix_thread/futex.rs diff --git a/src/services/libs/jinux-std/src/process/posix_thread/mod.rs b/services/libs/jinux-std/src/process/posix_thread/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/posix_thread/mod.rs rename to services/libs/jinux-std/src/process/posix_thread/mod.rs diff --git a/src/services/libs/jinux-std/src/process/posix_thread/name.rs b/services/libs/jinux-std/src/process/posix_thread/name.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/posix_thread/name.rs rename to services/libs/jinux-std/src/process/posix_thread/name.rs diff --git a/src/services/libs/jinux-std/src/process/posix_thread/posix_thread_ext.rs b/services/libs/jinux-std/src/process/posix_thread/posix_thread_ext.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/posix_thread/posix_thread_ext.rs rename to services/libs/jinux-std/src/process/posix_thread/posix_thread_ext.rs diff --git a/src/services/libs/jinux-std/src/process/posix_thread/robust_list.rs b/services/libs/jinux-std/src/process/posix_thread/robust_list.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/posix_thread/robust_list.rs rename to services/libs/jinux-std/src/process/posix_thread/robust_list.rs diff --git a/src/services/libs/jinux-std/src/process/process_filter.rs b/services/libs/jinux-std/src/process/process_filter.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/process_filter.rs rename to services/libs/jinux-std/src/process/process_filter.rs diff --git a/src/services/libs/jinux-std/src/process/process_group.rs b/services/libs/jinux-std/src/process/process_group.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/process_group.rs rename to services/libs/jinux-std/src/process/process_group.rs diff --git a/src/services/libs/jinux-std/src/process/process_table.rs b/services/libs/jinux-std/src/process/process_table.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/process_table.rs rename to services/libs/jinux-std/src/process/process_table.rs diff --git a/src/services/libs/jinux-std/src/process/process_vm/mmap_flags.rs b/services/libs/jinux-std/src/process/process_vm/mmap_flags.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/process_vm/mmap_flags.rs rename to services/libs/jinux-std/src/process/process_vm/mmap_flags.rs diff --git a/src/services/libs/jinux-std/src/process/process_vm/mod.rs b/services/libs/jinux-std/src/process/process_vm/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/process_vm/mod.rs rename to services/libs/jinux-std/src/process/process_vm/mod.rs diff --git a/src/services/libs/jinux-std/src/process/process_vm/user_heap.rs b/services/libs/jinux-std/src/process/process_vm/user_heap.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/process_vm/user_heap.rs rename to services/libs/jinux-std/src/process/process_vm/user_heap.rs diff --git a/src/services/libs/jinux-std/src/process/program_loader/elf/aux_vec.rs b/services/libs/jinux-std/src/process/program_loader/elf/aux_vec.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/program_loader/elf/aux_vec.rs rename to services/libs/jinux-std/src/process/program_loader/elf/aux_vec.rs diff --git a/src/services/libs/jinux-std/src/process/program_loader/elf/elf_file.rs b/services/libs/jinux-std/src/process/program_loader/elf/elf_file.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/program_loader/elf/elf_file.rs rename to services/libs/jinux-std/src/process/program_loader/elf/elf_file.rs diff --git a/src/services/libs/jinux-std/src/process/program_loader/elf/init_stack.rs b/services/libs/jinux-std/src/process/program_loader/elf/init_stack.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/program_loader/elf/init_stack.rs rename to services/libs/jinux-std/src/process/program_loader/elf/init_stack.rs diff --git a/src/services/libs/jinux-std/src/process/program_loader/elf/load_elf.rs b/services/libs/jinux-std/src/process/program_loader/elf/load_elf.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/program_loader/elf/load_elf.rs rename to services/libs/jinux-std/src/process/program_loader/elf/load_elf.rs diff --git a/src/services/libs/jinux-std/src/process/program_loader/elf/mod.rs b/services/libs/jinux-std/src/process/program_loader/elf/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/program_loader/elf/mod.rs rename to services/libs/jinux-std/src/process/program_loader/elf/mod.rs diff --git a/src/services/libs/jinux-std/src/process/program_loader/mod.rs b/services/libs/jinux-std/src/process/program_loader/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/program_loader/mod.rs rename to services/libs/jinux-std/src/process/program_loader/mod.rs diff --git a/src/services/libs/jinux-std/src/process/program_loader/shebang.rs b/services/libs/jinux-std/src/process/program_loader/shebang.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/program_loader/shebang.rs rename to services/libs/jinux-std/src/process/program_loader/shebang.rs diff --git a/src/services/libs/jinux-std/src/process/rlimit.rs b/services/libs/jinux-std/src/process/rlimit.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/rlimit.rs rename to services/libs/jinux-std/src/process/rlimit.rs diff --git a/src/services/libs/jinux-std/src/process/signal/c_types.rs b/services/libs/jinux-std/src/process/signal/c_types.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/c_types.rs rename to services/libs/jinux-std/src/process/signal/c_types.rs diff --git a/src/services/libs/jinux-std/src/process/signal/constants.rs b/services/libs/jinux-std/src/process/signal/constants.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/constants.rs rename to services/libs/jinux-std/src/process/signal/constants.rs diff --git a/src/services/libs/jinux-std/src/process/signal/mod.rs b/services/libs/jinux-std/src/process/signal/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/mod.rs rename to services/libs/jinux-std/src/process/signal/mod.rs diff --git a/src/services/libs/jinux-std/src/process/signal/sig_action.rs b/services/libs/jinux-std/src/process/signal/sig_action.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/sig_action.rs rename to services/libs/jinux-std/src/process/signal/sig_action.rs diff --git a/src/services/libs/jinux-std/src/process/signal/sig_disposition.rs b/services/libs/jinux-std/src/process/signal/sig_disposition.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/sig_disposition.rs rename to services/libs/jinux-std/src/process/signal/sig_disposition.rs diff --git a/src/services/libs/jinux-std/src/process/signal/sig_mask.rs b/services/libs/jinux-std/src/process/signal/sig_mask.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/sig_mask.rs rename to services/libs/jinux-std/src/process/signal/sig_mask.rs diff --git a/src/services/libs/jinux-std/src/process/signal/sig_num.rs b/services/libs/jinux-std/src/process/signal/sig_num.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/sig_num.rs rename to services/libs/jinux-std/src/process/signal/sig_num.rs diff --git a/src/services/libs/jinux-std/src/process/signal/sig_queues.rs b/services/libs/jinux-std/src/process/signal/sig_queues.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/sig_queues.rs rename to services/libs/jinux-std/src/process/signal/sig_queues.rs diff --git a/src/services/libs/jinux-std/src/process/signal/signals/fault.rs b/services/libs/jinux-std/src/process/signal/signals/fault.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/signals/fault.rs rename to services/libs/jinux-std/src/process/signal/signals/fault.rs diff --git a/src/services/libs/jinux-std/src/process/signal/signals/kernel.rs b/services/libs/jinux-std/src/process/signal/signals/kernel.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/signals/kernel.rs rename to services/libs/jinux-std/src/process/signal/signals/kernel.rs diff --git a/src/services/libs/jinux-std/src/process/signal/signals/mod.rs b/services/libs/jinux-std/src/process/signal/signals/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/signals/mod.rs rename to services/libs/jinux-std/src/process/signal/signals/mod.rs diff --git a/src/services/libs/jinux-std/src/process/signal/signals/user.rs b/services/libs/jinux-std/src/process/signal/signals/user.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/signal/signals/user.rs rename to services/libs/jinux-std/src/process/signal/signals/user.rs diff --git a/src/services/libs/jinux-std/src/process/status.rs b/services/libs/jinux-std/src/process/status.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/status.rs rename to services/libs/jinux-std/src/process/status.rs diff --git a/src/services/libs/jinux-std/src/process/wait.rs b/services/libs/jinux-std/src/process/wait.rs similarity index 100% rename from src/services/libs/jinux-std/src/process/wait.rs rename to services/libs/jinux-std/src/process/wait.rs diff --git a/src/services/libs/jinux-std/src/rights.rs b/services/libs/jinux-std/src/rights.rs similarity index 100% rename from src/services/libs/jinux-std/src/rights.rs rename to services/libs/jinux-std/src/rights.rs diff --git a/src/services/libs/jinux-std/src/syscall/access.rs b/services/libs/jinux-std/src/syscall/access.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/access.rs rename to services/libs/jinux-std/src/syscall/access.rs diff --git a/src/services/libs/jinux-std/src/syscall/arch_prctl.rs b/services/libs/jinux-std/src/syscall/arch_prctl.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/arch_prctl.rs rename to services/libs/jinux-std/src/syscall/arch_prctl.rs diff --git a/src/services/libs/jinux-std/src/syscall/brk.rs b/services/libs/jinux-std/src/syscall/brk.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/brk.rs rename to services/libs/jinux-std/src/syscall/brk.rs diff --git a/src/services/libs/jinux-std/src/syscall/chdir.rs b/services/libs/jinux-std/src/syscall/chdir.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/chdir.rs rename to services/libs/jinux-std/src/syscall/chdir.rs diff --git a/src/services/libs/jinux-std/src/syscall/clock_nanosleep.rs b/services/libs/jinux-std/src/syscall/clock_nanosleep.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/clock_nanosleep.rs rename to services/libs/jinux-std/src/syscall/clock_nanosleep.rs diff --git a/src/services/libs/jinux-std/src/syscall/clone.rs b/services/libs/jinux-std/src/syscall/clone.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/clone.rs rename to services/libs/jinux-std/src/syscall/clone.rs diff --git a/src/services/libs/jinux-std/src/syscall/close.rs b/services/libs/jinux-std/src/syscall/close.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/close.rs rename to services/libs/jinux-std/src/syscall/close.rs diff --git a/src/services/libs/jinux-std/src/syscall/constants.rs b/services/libs/jinux-std/src/syscall/constants.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/constants.rs rename to services/libs/jinux-std/src/syscall/constants.rs diff --git a/src/services/libs/jinux-std/src/syscall/dup.rs b/services/libs/jinux-std/src/syscall/dup.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/dup.rs rename to services/libs/jinux-std/src/syscall/dup.rs diff --git a/src/services/libs/jinux-std/src/syscall/execve.rs b/services/libs/jinux-std/src/syscall/execve.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/execve.rs rename to services/libs/jinux-std/src/syscall/execve.rs diff --git a/src/services/libs/jinux-std/src/syscall/exit.rs b/services/libs/jinux-std/src/syscall/exit.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/exit.rs rename to services/libs/jinux-std/src/syscall/exit.rs diff --git a/src/services/libs/jinux-std/src/syscall/exit_group.rs b/services/libs/jinux-std/src/syscall/exit_group.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/exit_group.rs rename to services/libs/jinux-std/src/syscall/exit_group.rs diff --git a/src/services/libs/jinux-std/src/syscall/fcntl.rs b/services/libs/jinux-std/src/syscall/fcntl.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/fcntl.rs rename to services/libs/jinux-std/src/syscall/fcntl.rs diff --git a/src/services/libs/jinux-std/src/syscall/fork.rs b/services/libs/jinux-std/src/syscall/fork.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/fork.rs rename to services/libs/jinux-std/src/syscall/fork.rs diff --git a/src/services/libs/jinux-std/src/syscall/futex.rs b/services/libs/jinux-std/src/syscall/futex.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/futex.rs rename to services/libs/jinux-std/src/syscall/futex.rs diff --git a/src/services/libs/jinux-std/src/syscall/getcwd.rs b/services/libs/jinux-std/src/syscall/getcwd.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/getcwd.rs rename to services/libs/jinux-std/src/syscall/getcwd.rs diff --git a/src/services/libs/jinux-std/src/syscall/getdents64.rs b/services/libs/jinux-std/src/syscall/getdents64.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/getdents64.rs rename to services/libs/jinux-std/src/syscall/getdents64.rs diff --git a/src/services/libs/jinux-std/src/syscall/getegid.rs b/services/libs/jinux-std/src/syscall/getegid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/getegid.rs rename to services/libs/jinux-std/src/syscall/getegid.rs diff --git a/src/services/libs/jinux-std/src/syscall/geteuid.rs b/services/libs/jinux-std/src/syscall/geteuid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/geteuid.rs rename to services/libs/jinux-std/src/syscall/geteuid.rs diff --git a/src/services/libs/jinux-std/src/syscall/getgid.rs b/services/libs/jinux-std/src/syscall/getgid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/getgid.rs rename to services/libs/jinux-std/src/syscall/getgid.rs diff --git a/src/services/libs/jinux-std/src/syscall/getpgrp.rs b/services/libs/jinux-std/src/syscall/getpgrp.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/getpgrp.rs rename to services/libs/jinux-std/src/syscall/getpgrp.rs diff --git a/src/services/libs/jinux-std/src/syscall/getpid.rs b/services/libs/jinux-std/src/syscall/getpid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/getpid.rs rename to services/libs/jinux-std/src/syscall/getpid.rs diff --git a/src/services/libs/jinux-std/src/syscall/getppid.rs b/services/libs/jinux-std/src/syscall/getppid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/getppid.rs rename to services/libs/jinux-std/src/syscall/getppid.rs diff --git a/src/services/libs/jinux-std/src/syscall/gettid.rs b/services/libs/jinux-std/src/syscall/gettid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/gettid.rs rename to services/libs/jinux-std/src/syscall/gettid.rs diff --git a/src/services/libs/jinux-std/src/syscall/getuid.rs b/services/libs/jinux-std/src/syscall/getuid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/getuid.rs rename to services/libs/jinux-std/src/syscall/getuid.rs diff --git a/src/services/libs/jinux-std/src/syscall/ioctl.rs b/services/libs/jinux-std/src/syscall/ioctl.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/ioctl.rs rename to services/libs/jinux-std/src/syscall/ioctl.rs diff --git a/src/services/libs/jinux-std/src/syscall/kill.rs b/services/libs/jinux-std/src/syscall/kill.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/kill.rs rename to services/libs/jinux-std/src/syscall/kill.rs diff --git a/src/services/libs/jinux-std/src/syscall/link.rs b/services/libs/jinux-std/src/syscall/link.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/link.rs rename to services/libs/jinux-std/src/syscall/link.rs diff --git a/src/services/libs/jinux-std/src/syscall/lseek.rs b/services/libs/jinux-std/src/syscall/lseek.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/lseek.rs rename to services/libs/jinux-std/src/syscall/lseek.rs diff --git a/src/services/libs/jinux-std/src/syscall/madvise.rs b/services/libs/jinux-std/src/syscall/madvise.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/madvise.rs rename to services/libs/jinux-std/src/syscall/madvise.rs diff --git a/src/services/libs/jinux-std/src/syscall/mkdir.rs b/services/libs/jinux-std/src/syscall/mkdir.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/mkdir.rs rename to services/libs/jinux-std/src/syscall/mkdir.rs diff --git a/src/services/libs/jinux-std/src/syscall/mmap.rs b/services/libs/jinux-std/src/syscall/mmap.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/mmap.rs rename to services/libs/jinux-std/src/syscall/mmap.rs diff --git a/src/services/libs/jinux-std/src/syscall/mod.rs b/services/libs/jinux-std/src/syscall/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/mod.rs rename to services/libs/jinux-std/src/syscall/mod.rs diff --git a/src/services/libs/jinux-std/src/syscall/mprotect.rs b/services/libs/jinux-std/src/syscall/mprotect.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/mprotect.rs rename to services/libs/jinux-std/src/syscall/mprotect.rs diff --git a/src/services/libs/jinux-std/src/syscall/munmap.rs b/services/libs/jinux-std/src/syscall/munmap.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/munmap.rs rename to services/libs/jinux-std/src/syscall/munmap.rs diff --git a/src/services/libs/jinux-std/src/syscall/open.rs b/services/libs/jinux-std/src/syscall/open.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/open.rs rename to services/libs/jinux-std/src/syscall/open.rs diff --git a/src/services/libs/jinux-std/src/syscall/pause.rs b/services/libs/jinux-std/src/syscall/pause.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/pause.rs rename to services/libs/jinux-std/src/syscall/pause.rs diff --git a/src/services/libs/jinux-std/src/syscall/poll.rs b/services/libs/jinux-std/src/syscall/poll.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/poll.rs rename to services/libs/jinux-std/src/syscall/poll.rs diff --git a/src/services/libs/jinux-std/src/syscall/prctl.rs b/services/libs/jinux-std/src/syscall/prctl.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/prctl.rs rename to services/libs/jinux-std/src/syscall/prctl.rs diff --git a/src/services/libs/jinux-std/src/syscall/pread64.rs b/services/libs/jinux-std/src/syscall/pread64.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/pread64.rs rename to services/libs/jinux-std/src/syscall/pread64.rs diff --git a/src/services/libs/jinux-std/src/syscall/prlimit64.rs b/services/libs/jinux-std/src/syscall/prlimit64.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/prlimit64.rs rename to services/libs/jinux-std/src/syscall/prlimit64.rs diff --git a/src/services/libs/jinux-std/src/syscall/read.rs b/services/libs/jinux-std/src/syscall/read.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/read.rs rename to services/libs/jinux-std/src/syscall/read.rs diff --git a/src/services/libs/jinux-std/src/syscall/readlink.rs b/services/libs/jinux-std/src/syscall/readlink.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/readlink.rs rename to services/libs/jinux-std/src/syscall/readlink.rs diff --git a/src/services/libs/jinux-std/src/syscall/rename.rs b/services/libs/jinux-std/src/syscall/rename.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/rename.rs rename to services/libs/jinux-std/src/syscall/rename.rs diff --git a/src/services/libs/jinux-std/src/syscall/rmdir.rs b/services/libs/jinux-std/src/syscall/rmdir.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/rmdir.rs rename to services/libs/jinux-std/src/syscall/rmdir.rs diff --git a/src/services/libs/jinux-std/src/syscall/rt_sigaction.rs b/services/libs/jinux-std/src/syscall/rt_sigaction.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/rt_sigaction.rs rename to services/libs/jinux-std/src/syscall/rt_sigaction.rs diff --git a/src/services/libs/jinux-std/src/syscall/rt_sigprocmask.rs b/services/libs/jinux-std/src/syscall/rt_sigprocmask.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/rt_sigprocmask.rs rename to services/libs/jinux-std/src/syscall/rt_sigprocmask.rs diff --git a/src/services/libs/jinux-std/src/syscall/rt_sigreturn.rs b/services/libs/jinux-std/src/syscall/rt_sigreturn.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/rt_sigreturn.rs rename to services/libs/jinux-std/src/syscall/rt_sigreturn.rs diff --git a/src/services/libs/jinux-std/src/syscall/sched_yield.rs b/services/libs/jinux-std/src/syscall/sched_yield.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/sched_yield.rs rename to services/libs/jinux-std/src/syscall/sched_yield.rs diff --git a/src/services/libs/jinux-std/src/syscall/set_robust_list.rs b/services/libs/jinux-std/src/syscall/set_robust_list.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/set_robust_list.rs rename to services/libs/jinux-std/src/syscall/set_robust_list.rs diff --git a/src/services/libs/jinux-std/src/syscall/set_tid_address.rs b/services/libs/jinux-std/src/syscall/set_tid_address.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/set_tid_address.rs rename to services/libs/jinux-std/src/syscall/set_tid_address.rs diff --git a/src/services/libs/jinux-std/src/syscall/setpgid.rs b/services/libs/jinux-std/src/syscall/setpgid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/setpgid.rs rename to services/libs/jinux-std/src/syscall/setpgid.rs diff --git a/src/services/libs/jinux-std/src/syscall/stat.rs b/services/libs/jinux-std/src/syscall/stat.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/stat.rs rename to services/libs/jinux-std/src/syscall/stat.rs diff --git a/src/services/libs/jinux-std/src/syscall/symlink.rs b/services/libs/jinux-std/src/syscall/symlink.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/symlink.rs rename to services/libs/jinux-std/src/syscall/symlink.rs diff --git a/src/services/libs/jinux-std/src/syscall/tgkill.rs b/services/libs/jinux-std/src/syscall/tgkill.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/tgkill.rs rename to services/libs/jinux-std/src/syscall/tgkill.rs diff --git a/src/services/libs/jinux-std/src/syscall/time.rs b/services/libs/jinux-std/src/syscall/time.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/time.rs rename to services/libs/jinux-std/src/syscall/time.rs diff --git a/src/services/libs/jinux-std/src/syscall/umask.rs b/services/libs/jinux-std/src/syscall/umask.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/umask.rs rename to services/libs/jinux-std/src/syscall/umask.rs diff --git a/src/services/libs/jinux-std/src/syscall/uname.rs b/services/libs/jinux-std/src/syscall/uname.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/uname.rs rename to services/libs/jinux-std/src/syscall/uname.rs diff --git a/src/services/libs/jinux-std/src/syscall/unlink.rs b/services/libs/jinux-std/src/syscall/unlink.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/unlink.rs rename to services/libs/jinux-std/src/syscall/unlink.rs diff --git a/src/services/libs/jinux-std/src/syscall/utimens.rs b/services/libs/jinux-std/src/syscall/utimens.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/utimens.rs rename to services/libs/jinux-std/src/syscall/utimens.rs diff --git a/src/services/libs/jinux-std/src/syscall/wait4.rs b/services/libs/jinux-std/src/syscall/wait4.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/wait4.rs rename to services/libs/jinux-std/src/syscall/wait4.rs diff --git a/src/services/libs/jinux-std/src/syscall/waitid.rs b/services/libs/jinux-std/src/syscall/waitid.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/waitid.rs rename to services/libs/jinux-std/src/syscall/waitid.rs diff --git a/src/services/libs/jinux-std/src/syscall/write.rs b/services/libs/jinux-std/src/syscall/write.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/write.rs rename to services/libs/jinux-std/src/syscall/write.rs diff --git a/src/services/libs/jinux-std/src/syscall/writev.rs b/services/libs/jinux-std/src/syscall/writev.rs similarity index 100% rename from src/services/libs/jinux-std/src/syscall/writev.rs rename to services/libs/jinux-std/src/syscall/writev.rs diff --git a/src/services/libs/jinux-std/src/thread/exception.rs b/services/libs/jinux-std/src/thread/exception.rs similarity index 100% rename from src/services/libs/jinux-std/src/thread/exception.rs rename to services/libs/jinux-std/src/thread/exception.rs diff --git a/src/services/libs/jinux-std/src/thread/kernel_thread.rs b/services/libs/jinux-std/src/thread/kernel_thread.rs similarity index 100% rename from src/services/libs/jinux-std/src/thread/kernel_thread.rs rename to services/libs/jinux-std/src/thread/kernel_thread.rs diff --git a/src/services/libs/jinux-std/src/thread/mod.rs b/services/libs/jinux-std/src/thread/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/thread/mod.rs rename to services/libs/jinux-std/src/thread/mod.rs diff --git a/src/services/libs/jinux-std/src/thread/status.rs b/services/libs/jinux-std/src/thread/status.rs similarity index 100% rename from src/services/libs/jinux-std/src/thread/status.rs rename to services/libs/jinux-std/src/thread/status.rs diff --git a/src/services/libs/jinux-std/src/thread/task.rs b/services/libs/jinux-std/src/thread/task.rs similarity index 100% rename from src/services/libs/jinux-std/src/thread/task.rs rename to services/libs/jinux-std/src/thread/task.rs diff --git a/src/services/libs/jinux-std/src/thread/thread_table.rs b/services/libs/jinux-std/src/thread/thread_table.rs similarity index 100% rename from src/services/libs/jinux-std/src/thread/thread_table.rs rename to services/libs/jinux-std/src/thread/thread_table.rs diff --git a/src/services/libs/jinux-std/src/time/mod.rs b/services/libs/jinux-std/src/time/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/time/mod.rs rename to services/libs/jinux-std/src/time/mod.rs diff --git a/src/services/libs/jinux-std/src/time/system_time.rs b/services/libs/jinux-std/src/time/system_time.rs similarity index 100% rename from src/services/libs/jinux-std/src/time/system_time.rs rename to services/libs/jinux-std/src/time/system_time.rs diff --git a/src/services/libs/jinux-std/src/tty/line_discipline.rs b/services/libs/jinux-std/src/tty/line_discipline.rs similarity index 100% rename from src/services/libs/jinux-std/src/tty/line_discipline.rs rename to services/libs/jinux-std/src/tty/line_discipline.rs diff --git a/src/services/libs/jinux-std/src/tty/mod.rs b/services/libs/jinux-std/src/tty/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/tty/mod.rs rename to services/libs/jinux-std/src/tty/mod.rs diff --git a/src/services/libs/jinux-std/src/tty/termio.rs b/services/libs/jinux-std/src/tty/termio.rs similarity index 100% rename from src/services/libs/jinux-std/src/tty/termio.rs rename to services/libs/jinux-std/src/tty/termio.rs diff --git a/src/services/libs/jinux-std/src/util/mod.rs b/services/libs/jinux-std/src/util/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/util/mod.rs rename to services/libs/jinux-std/src/util/mod.rs diff --git a/src/services/libs/jinux-std/src/vm/mod.rs b/services/libs/jinux-std/src/vm/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/mod.rs rename to services/libs/jinux-std/src/vm/mod.rs diff --git a/src/services/libs/jinux-std/src/vm/page_fault_handler.rs b/services/libs/jinux-std/src/vm/page_fault_handler.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/page_fault_handler.rs rename to services/libs/jinux-std/src/vm/page_fault_handler.rs diff --git a/src/services/libs/jinux-std/src/vm/perms.rs b/services/libs/jinux-std/src/vm/perms.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/perms.rs rename to services/libs/jinux-std/src/vm/perms.rs diff --git a/src/services/libs/jinux-std/src/vm/vmar/dyn_cap.rs b/services/libs/jinux-std/src/vm/vmar/dyn_cap.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmar/dyn_cap.rs rename to services/libs/jinux-std/src/vm/vmar/dyn_cap.rs diff --git a/src/services/libs/jinux-std/src/vm/vmar/mod.rs b/services/libs/jinux-std/src/vm/vmar/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmar/mod.rs rename to services/libs/jinux-std/src/vm/vmar/mod.rs diff --git a/src/services/libs/jinux-std/src/vm/vmar/options.rs b/services/libs/jinux-std/src/vm/vmar/options.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmar/options.rs rename to services/libs/jinux-std/src/vm/vmar/options.rs diff --git a/src/services/libs/jinux-std/src/vm/vmar/static_cap.rs b/services/libs/jinux-std/src/vm/vmar/static_cap.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmar/static_cap.rs rename to services/libs/jinux-std/src/vm/vmar/static_cap.rs diff --git a/src/services/libs/jinux-std/src/vm/vmar/vm_mapping.rs b/services/libs/jinux-std/src/vm/vmar/vm_mapping.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmar/vm_mapping.rs rename to services/libs/jinux-std/src/vm/vmar/vm_mapping.rs diff --git a/src/services/libs/jinux-std/src/vm/vmo/dyn_cap.rs b/services/libs/jinux-std/src/vm/vmo/dyn_cap.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmo/dyn_cap.rs rename to services/libs/jinux-std/src/vm/vmo/dyn_cap.rs diff --git a/src/services/libs/jinux-std/src/vm/vmo/mod.rs b/services/libs/jinux-std/src/vm/vmo/mod.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmo/mod.rs rename to services/libs/jinux-std/src/vm/vmo/mod.rs diff --git a/src/services/libs/jinux-std/src/vm/vmo/options.rs b/services/libs/jinux-std/src/vm/vmo/options.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmo/options.rs rename to services/libs/jinux-std/src/vm/vmo/options.rs diff --git a/src/services/libs/jinux-std/src/vm/vmo/pager.rs b/services/libs/jinux-std/src/vm/vmo/pager.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmo/pager.rs rename to services/libs/jinux-std/src/vm/vmo/pager.rs diff --git a/src/services/libs/jinux-std/src/vm/vmo/static_cap.rs b/services/libs/jinux-std/src/vm/vmo/static_cap.rs similarity index 100% rename from src/services/libs/jinux-std/src/vm/vmo/static_cap.rs rename to services/libs/jinux-std/src/vm/vmo/static_cap.rs diff --git a/src/services/libs/jinux-util/Cargo.toml b/services/libs/jinux-util/Cargo.toml similarity index 100% rename from src/services/libs/jinux-util/Cargo.toml rename to services/libs/jinux-util/Cargo.toml diff --git a/src/services/libs/jinux-util/src/frame_ptr.rs b/services/libs/jinux-util/src/frame_ptr.rs similarity index 100% rename from src/services/libs/jinux-util/src/frame_ptr.rs rename to services/libs/jinux-util/src/frame_ptr.rs diff --git a/src/services/libs/jinux-util/src/lib.rs b/services/libs/jinux-util/src/lib.rs similarity index 100% rename from src/services/libs/jinux-util/src/lib.rs rename to services/libs/jinux-util/src/lib.rs diff --git a/src/services/libs/jinux-util/src/union_read_ptr.rs b/services/libs/jinux-util/src/union_read_ptr.rs similarity index 100% rename from src/services/libs/jinux-util/src/union_read_ptr.rs rename to services/libs/jinux-util/src/union_read_ptr.rs diff --git a/src/services/libs/typeflags-util/Cargo.toml b/services/libs/typeflags-util/Cargo.toml similarity index 100% rename from src/services/libs/typeflags-util/Cargo.toml rename to services/libs/typeflags-util/Cargo.toml diff --git a/src/services/libs/typeflags-util/src/assert.rs b/services/libs/typeflags-util/src/assert.rs similarity index 100% rename from src/services/libs/typeflags-util/src/assert.rs rename to services/libs/typeflags-util/src/assert.rs diff --git a/src/services/libs/typeflags-util/src/bool.rs b/services/libs/typeflags-util/src/bool.rs similarity index 100% rename from src/services/libs/typeflags-util/src/bool.rs rename to services/libs/typeflags-util/src/bool.rs diff --git a/src/services/libs/typeflags-util/src/extend.rs b/services/libs/typeflags-util/src/extend.rs similarity index 100% rename from src/services/libs/typeflags-util/src/extend.rs rename to services/libs/typeflags-util/src/extend.rs diff --git a/src/services/libs/typeflags-util/src/if_.rs b/services/libs/typeflags-util/src/if_.rs similarity index 100% rename from src/services/libs/typeflags-util/src/if_.rs rename to services/libs/typeflags-util/src/if_.rs diff --git a/src/services/libs/typeflags-util/src/lib.rs b/services/libs/typeflags-util/src/lib.rs similarity index 100% rename from src/services/libs/typeflags-util/src/lib.rs rename to services/libs/typeflags-util/src/lib.rs diff --git a/src/services/libs/typeflags-util/src/same.rs b/services/libs/typeflags-util/src/same.rs similarity index 100% rename from src/services/libs/typeflags-util/src/same.rs rename to services/libs/typeflags-util/src/same.rs diff --git a/src/services/libs/typeflags-util/src/set.rs b/services/libs/typeflags-util/src/set.rs similarity index 100% rename from src/services/libs/typeflags-util/src/set.rs rename to services/libs/typeflags-util/src/set.rs diff --git a/src/services/libs/typeflags/Cargo.toml b/services/libs/typeflags/Cargo.toml similarity index 100% rename from src/services/libs/typeflags/Cargo.toml rename to services/libs/typeflags/Cargo.toml diff --git a/src/services/libs/typeflags/src/flag_set.rs b/services/libs/typeflags/src/flag_set.rs similarity index 100% rename from src/services/libs/typeflags/src/flag_set.rs rename to services/libs/typeflags/src/flag_set.rs diff --git a/src/services/libs/typeflags/src/lib.rs b/services/libs/typeflags/src/lib.rs similarity index 100% rename from src/services/libs/typeflags/src/lib.rs rename to services/libs/typeflags/src/lib.rs diff --git a/src/services/libs/typeflags/src/type_flag.rs b/services/libs/typeflags/src/type_flag.rs similarity index 100% rename from src/services/libs/typeflags/src/type_flag.rs rename to services/libs/typeflags/src/type_flag.rs diff --git a/src/services/libs/typeflags/src/util.rs b/services/libs/typeflags/src/util.rs similarity index 100% rename from src/services/libs/typeflags/src/util.rs rename to services/libs/typeflags/src/util.rs diff --git a/src/apps/hello_c/hello b/src/apps/hello_c/hello deleted file mode 100755 index aff26147f..000000000 Binary files a/src/apps/hello_c/hello and /dev/null differ diff --git a/src/tests/console_input.rs b/tests/console_input.rs similarity index 100% rename from src/tests/console_input.rs rename to tests/console_input.rs diff --git a/src/tests/framebuffer.rs b/tests/framebuffer.rs similarity index 100% rename from src/tests/framebuffer.rs rename to tests/framebuffer.rs diff --git a/src/tests/rtc.rs b/tests/rtc.rs similarity index 100% rename from src/tests/rtc.rs rename to tests/rtc.rs diff --git a/src/tests/test_example.rs b/tests/test_example.rs similarity index 100% rename from src/tests/test_example.rs rename to tests/test_example.rs diff --git a/src/tests/timer_test.rs b/tests/timer_test.rs similarity index 100% rename from src/tests/timer_test.rs rename to tests/timer_test.rs diff --git a/src/x86_64-custom.json b/x86_64-custom.json similarity index 100% rename from src/x86_64-custom.json rename to x86_64-custom.json