Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-27 19:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dependency issue between components logger and virtio

Browse Source
This commit is contained in:
Shaowei Song
2024-12-12 11:38:42 +00:00
committed by Tate, Hongliang Tian
parent 8bbbde4ccb
commit 4cb85f0adb
6 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Cargo.lock generated
View File

@ -81,7 +81,6 @@ name = "aster-block"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"align_ext", "align_ext",
"aster-logger",
"aster-util", "aster-util",
"bitflags 1.3.2", "bitflags 1.3.2",
"bitvec", "bitvec",
@ -122,7 +121,6 @@ name = "aster-input"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"ascii", "ascii",
"aster-logger",
"aster-rights", "aster-rights",
"aster-util", "aster-util",
"bitflags 1.3.2", "bitflags 1.3.2",
@ -138,6 +136,7 @@ name = "aster-logger"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"aster-console", "aster-console",
"aster-virtio",
"cfg-if", "cfg-if",
"component", "component",
"log", "log",
@ -152,7 +151,6 @@ version = "0.1.0"
dependencies = [ dependencies = [
"align_ext", "align_ext",
"aster-bigtcp", "aster-bigtcp",
"aster-logger",
"aster-rights", "aster-rights",
"aster-util", "aster-util",
"bitflags 1.3.2", "bitflags 1.3.2",
@ -281,7 +279,6 @@ dependencies = [
"aster-block", "aster-block",
"aster-console", "aster-console",
"aster-input", "aster-input",
"aster-logger",
"aster-network", "aster-network",
"aster-rights", "aster-rights",
"aster-util", "aster-util",

1
kernel/comps/block/Cargo.toml
View File

@ -11,7 +11,6 @@ spin = "0.9.4"
ostd = { path = "../../../ostd" } ostd = { path = "../../../ostd" }
align_ext = { path = "../../../ostd/libs/align_ext" } align_ext = { path = "../../../ostd/libs/align_ext" }
aster-util = { path = "../../libs/aster-util" } aster-util = { path = "../../libs/aster-util" }
aster-logger = { path = "../logger" }
int-to-c-enum = { path = "../../libs/int-to-c-enum" } int-to-c-enum = { path = "../../libs/int-to-c-enum" }
component = { path = "../../libs/comp-sys/component" } component = { path = "../../libs/comp-sys/component" }
log = "0.4" log = "0.4"

1
kernel/comps/input/Cargo.toml
View File

@ -11,7 +11,6 @@ spin = "0.9.4"
ostd = { path = "../../../ostd" } ostd = { path = "../../../ostd" }
aster-util = { path = "../../libs/aster-util" } aster-util = { path = "../../libs/aster-util" }
aster-rights = { path = "../../libs/aster-rights" } aster-rights = { path = "../../libs/aster-rights" }
aster-logger = { path = "../logger" }
component = { path = "../../libs/comp-sys/component" } component = { path = "../../libs/comp-sys/component" }
int-to-c-enum = { path = "../../libs/int-to-c-enum" } int-to-c-enum = { path = "../../libs/int-to-c-enum" }
log = "0.4" log = "0.4"

1
kernel/comps/logger/Cargo.toml
View File

@ -8,6 +8,7 @@ edition = "2021"
[dependencies] [dependencies]
component = { path = "../../libs/comp-sys/component" } component = { path = "../../libs/comp-sys/component" }
aster-console = { path = "../console" } aster-console = { path = "../console" }
aster-virtio = { path = "../virtio" }
log = "0.4" log = "0.4"
ostd = { path = "../../../ostd" } ostd = { path = "../../../ostd" }
spin = "0.9.4" spin = "0.9.4"

1
kernel/comps/network/Cargo.toml
View File

@ -10,7 +10,6 @@ align_ext = { path = "../../../ostd/libs/align_ext" }
aster-util = { path = "../../libs/aster-util" } aster-util = { path = "../../libs/aster-util" }
aster-rights = { path = "../../libs/aster-rights" } aster-rights = { path = "../../libs/aster-rights" }
aster-bigtcp = { path = "../../libs/aster-bigtcp" } aster-bigtcp = { path = "../../libs/aster-bigtcp" }
aster-logger = { path = "../logger" }
bitflags = "1.3" bitflags = "1.3"
bitvec = { version = "1.0.1", default-features = false, features = ["alloc"] } bitvec = { version = "1.0.1", default-features = false, features = ["alloc"] }
component = { path = "../../libs/comp-sys/component" } component = { path = "../../libs/comp-sys/component" }

1
kernel/comps/virtio/Cargo.toml
View File

@ -12,7 +12,6 @@ bytes = { version = "1.4.0", default-features = false }
align_ext = { path = "../../../ostd/libs/align_ext" } align_ext = { path = "../../../ostd/libs/align_ext" }
aster-input = { path = "../input" } aster-input = { path = "../input" }
aster-block = { path = "../block" } aster-block = { path = "../block" }
aster-logger = { path = "../logger" }
aster-network = { path = "../network" } aster-network = { path = "../network" }
aster-console = { path = "../console" } aster-console = { path = "../console" }
aster-util = { path = "../../libs/aster-util" } aster-util = { path = "../../libs/aster-util" }