From 918f4e370aadd569c1f7b6cee452fe4050e68dee Mon Sep 17 00:00:00 2001 From: h00277865 Date: Mon, 27 Sep 2021 11:28:12 +0800 Subject: [PATCH] Restructure the directory. --- Cargo.toml | 5 +---- Dockerfile | 2 +- libs/cgroup/Cargo.toml | 9 --------- libs/cgroup/src/lib.rs | 7 ------- libs/dbus/Cargo.toml | 9 --------- libs/dbus/src/lib.rs | 7 ------- libs/job/Cargo.toml | 9 --------- libs/job/src/lib.rs | 7 ------- libs/udev/Cargo.toml | 9 --------- libs/udev/src/lib.rs | 7 ------- libs/unit/Cargo.toml | 9 --------- libs/unit/src/lib.rs | 7 ------- src/bootup/Cargo.toml | 9 --------- src/bootup/src/main.rs | 3 --- {libs => src}/event/Cargo.toml | 0 {libs => src}/event/src/lib.rs | 0 src/{main => init}/Cargo.toml | 9 +++------ src/{main => init}/src/main.rs | 0 src/loggerd/Cargo.toml | 9 --------- src/loggerd/src/main.rs | 3 --- src/logind/Cargo.toml | 9 --------- src/logind/src/lib.rs | 7 ------- src/manager/Cargo.toml | 9 --------- src/manager/src/main.rs | 3 --- src/shutdown/Cargo.toml | 9 --------- src/shutdown/src/main.rs | 3 --- src/udevd/Cargo.toml | 9 --------- src/udevd/src/lib.rs | 7 ------- {libs => src}/utils/Cargo.toml | 0 {libs => src}/utils/src/lib.rs | 0 {libs => src}/utils/src/macros.rs | 0 31 files changed, 5 insertions(+), 171 deletions(-) delete mode 100644 libs/cgroup/Cargo.toml delete mode 100644 libs/cgroup/src/lib.rs delete mode 100644 libs/dbus/Cargo.toml delete mode 100644 libs/dbus/src/lib.rs delete mode 100644 libs/job/Cargo.toml delete mode 100644 libs/job/src/lib.rs delete mode 100644 libs/udev/Cargo.toml delete mode 100644 libs/udev/src/lib.rs delete mode 100644 libs/unit/Cargo.toml delete mode 100644 libs/unit/src/lib.rs delete mode 100644 src/bootup/Cargo.toml delete mode 100644 src/bootup/src/main.rs rename {libs => src}/event/Cargo.toml (100%) rename {libs => src}/event/src/lib.rs (100%) rename src/{main => init}/Cargo.toml (66%) rename src/{main => init}/src/main.rs (100%) delete mode 100644 src/loggerd/Cargo.toml delete mode 100644 src/loggerd/src/main.rs delete mode 100644 src/logind/Cargo.toml delete mode 100644 src/logind/src/lib.rs delete mode 100644 src/manager/Cargo.toml delete mode 100644 src/manager/src/main.rs delete mode 100644 src/shutdown/Cargo.toml delete mode 100644 src/shutdown/src/main.rs delete mode 100644 src/udevd/Cargo.toml delete mode 100644 src/udevd/src/lib.rs rename {libs => src}/utils/Cargo.toml (100%) rename {libs => src}/utils/src/lib.rs (100%) rename {libs => src}/utils/src/macros.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index e5b4d61e..b7ae88b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,5 @@ [workspace] members = [ - "libs/utils", - "libs/event", - "libs/dbus", - "src/main", + "src/init", "tests", ] diff --git a/Dockerfile b/Dockerfile index 06bf30ad..d1d0fe50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM scratch #ADD target/x86_64-unknown-linux-musl/debug/process1 /sbin/init -COPY target/x86_64-unknown-linux-musl/debug/process1 /sbin/init +COPY target/x86_64-unknown-linux-musl/debug/init /sbin/init CMD ["/sbin/init"] diff --git a/libs/cgroup/Cargo.toml b/libs/cgroup/Cargo.toml deleted file mode 100644 index b9999387..00000000 --- a/libs/cgroup/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "cgroup" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/cgroup/src/lib.rs b/libs/cgroup/src/lib.rs deleted file mode 100644 index 31e1bb20..00000000 --- a/libs/cgroup/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/dbus/Cargo.toml b/libs/dbus/Cargo.toml deleted file mode 100644 index ad47cd97..00000000 --- a/libs/dbus/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "dbus" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/dbus/src/lib.rs b/libs/dbus/src/lib.rs deleted file mode 100644 index 31e1bb20..00000000 --- a/libs/dbus/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/job/Cargo.toml b/libs/job/Cargo.toml deleted file mode 100644 index 2c506d8c..00000000 --- a/libs/job/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "job" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/job/src/lib.rs b/libs/job/src/lib.rs deleted file mode 100644 index 31e1bb20..00000000 --- a/libs/job/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/udev/Cargo.toml b/libs/udev/Cargo.toml deleted file mode 100644 index e9d2444c..00000000 --- a/libs/udev/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "udev" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/udev/src/lib.rs b/libs/udev/src/lib.rs deleted file mode 100644 index 31e1bb20..00000000 --- a/libs/udev/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/unit/Cargo.toml b/libs/unit/Cargo.toml deleted file mode 100644 index 7a7e1f70..00000000 --- a/libs/unit/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "unit" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/libs/unit/src/lib.rs b/libs/unit/src/lib.rs deleted file mode 100644 index 31e1bb20..00000000 --- a/libs/unit/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/src/bootup/Cargo.toml b/src/bootup/Cargo.toml deleted file mode 100644 index b03c8583..00000000 --- a/src/bootup/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "bootup" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/bootup/src/main.rs b/src/bootup/src/main.rs deleted file mode 100644 index e7a11a96..00000000 --- a/src/bootup/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/libs/event/Cargo.toml b/src/event/Cargo.toml similarity index 100% rename from libs/event/Cargo.toml rename to src/event/Cargo.toml diff --git a/libs/event/src/lib.rs b/src/event/src/lib.rs similarity index 100% rename from libs/event/src/lib.rs rename to src/event/src/lib.rs diff --git a/src/main/Cargo.toml b/src/init/Cargo.toml similarity index 66% rename from src/main/Cargo.toml rename to src/init/Cargo.toml index 8fe34953..f62627b4 100644 --- a/src/main/Cargo.toml +++ b/src/init/Cargo.toml @@ -1,15 +1,12 @@ [package] -name = "process1" +name = "init" version = "0.1.0" -authors = ["Shinwell Hu "] +authors = ["h00277865 "] edition = "2018" -license = "MulanPSL-2.0" - # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] signal-hook = { version = "0.3.7", features = ["extended-siginfo"] } -utils = { path = "../../libs/utils" } +utils = { path = "../utils" } libc = { version = "^0.2" } - diff --git a/src/main/src/main.rs b/src/init/src/main.rs similarity index 100% rename from src/main/src/main.rs rename to src/init/src/main.rs diff --git a/src/loggerd/Cargo.toml b/src/loggerd/Cargo.toml deleted file mode 100644 index 4315a66b..00000000 --- a/src/loggerd/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "loggerd" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/loggerd/src/main.rs b/src/loggerd/src/main.rs deleted file mode 100644 index e7a11a96..00000000 --- a/src/loggerd/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/src/logind/Cargo.toml b/src/logind/Cargo.toml deleted file mode 100644 index ca1b9e38..00000000 --- a/src/logind/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "logind" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/logind/src/lib.rs b/src/logind/src/lib.rs deleted file mode 100644 index 31e1bb20..00000000 --- a/src/logind/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/src/manager/Cargo.toml b/src/manager/Cargo.toml deleted file mode 100644 index 2b708697..00000000 --- a/src/manager/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "manager" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/manager/src/main.rs b/src/manager/src/main.rs deleted file mode 100644 index e7a11a96..00000000 --- a/src/manager/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/src/shutdown/Cargo.toml b/src/shutdown/Cargo.toml deleted file mode 100644 index ac0f04e4..00000000 --- a/src/shutdown/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "shutdown" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/shutdown/src/main.rs b/src/shutdown/src/main.rs deleted file mode 100644 index e7a11a96..00000000 --- a/src/shutdown/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - println!("Hello, world!"); -} diff --git a/src/udevd/Cargo.toml b/src/udevd/Cargo.toml deleted file mode 100644 index 76e29139..00000000 --- a/src/udevd/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "udevd" -version = "0.1.0" -authors = ["overweight "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/src/udevd/src/lib.rs b/src/udevd/src/lib.rs deleted file mode 100644 index 31e1bb20..00000000 --- a/src/udevd/src/lib.rs +++ /dev/null @@ -1,7 +0,0 @@ -#[cfg(test)] -mod tests { - #[test] - fn it_works() { - assert_eq!(2 + 2, 4); - } -} diff --git a/libs/utils/Cargo.toml b/src/utils/Cargo.toml similarity index 100% rename from libs/utils/Cargo.toml rename to src/utils/Cargo.toml diff --git a/libs/utils/src/lib.rs b/src/utils/src/lib.rs similarity index 100% rename from libs/utils/src/lib.rs rename to src/utils/src/lib.rs diff --git a/libs/utils/src/macros.rs b/src/utils/src/macros.rs similarity index 100% rename from libs/utils/src/macros.rs rename to src/utils/src/macros.rs -- Gitee