diff --git a/Cargo.lock b/Cargo.lock index 4c10d0728..2c1f46132 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1104,15 +1104,6 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -[[package]] -name = "lwext4_rust" -version = "0.2.0" -source = "git+https://github.com/elliott10/lwext4_rust#83489293ef4535672caee0c5755729f3e0315a96" -dependencies = [ - "log", - "printf-compat", -] - [[package]] name = "lwip_rust" version = "0.1.0" @@ -1670,7 +1661,6 @@ dependencies = [ "fatfs", "lazy_init", "log", - "lwext4_rust", "memory_addr", "ruxdriver", "spin", diff --git a/api/ruxfeat/Cargo.toml b/api/ruxfeat/Cargo.toml index af3e019c3..7ba90ce99 100644 --- a/api/ruxfeat/Cargo.toml +++ b/api/ruxfeat/Cargo.toml @@ -51,7 +51,7 @@ blkfs = ["ruxdriver/virtio-blk", "ruxruntime/blkfs", "ruxfs/blkfs"] myfs = ["ruxfs?/myfs"] 9pfs = [] fatfs = ["ruxfs?/fatfs"] -lwext4_rust = ["ruxfs?/lwext4_rust"] +# lwext4_rust = ["ruxfs?/lwext4_rust"] ext4_rs = ["ruxfs?/ext4_rs"] another_ext4 = ["ruxfs?/another_ext4"] diff --git a/modules/ruxfs/Cargo.toml b/modules/ruxfs/Cargo.toml index 60d9444c9..c81b331e8 100644 --- a/modules/ruxfs/Cargo.toml +++ b/modules/ruxfs/Cargo.toml @@ -19,7 +19,7 @@ sysfs = ["dep:axfs_ramfs"] etcfs = ["dep:axfs_ramfs"] blkfs = [] fatfs = ["blkfs", "dep:fatfs"] -lwext4_rust = ["blkfs", "dep:lwext4_rust"] +# lwext4_rust = ["blkfs", "dep:lwext4_rust"] ext4_rs = ["blkfs", "dep:ext4_rs"] another_ext4 = ["blkfs","dep:another_ext4"] myfs = [] @@ -46,7 +46,7 @@ crate_interface = { version = "0.1.1" } ruxdriver = { path = "../ruxdriver", features = ["block"] } axalloc = { path = "../axalloc", optional = true } memory_addr = "0.1.0" -lwext4_rust = { git = "https://github.com/elliott10/lwext4_rust", optional = true } +# lwext4_rust = { git = "https://github.com/elliott10/lwext4_rust", optional = true } ext4_rs = { git = "https://github.com/yuoo655/ext4_rs.git", rev= "6bcc7f5", optional = true } another_ext4 = { git = "https://github.com/LJxTHUCS/another_ext4.git", optional = true } diff --git a/modules/ruxfs/src/fs/mod.rs b/modules/ruxfs/src/fs/mod.rs index 0c7cdec10..900ba133e 100644 --- a/modules/ruxfs/src/fs/mod.rs +++ b/modules/ruxfs/src/fs/mod.rs @@ -12,8 +12,8 @@ cfg_if::cfg_if! { pub mod myfs; } else if #[cfg(feature = "fatfs")] { pub mod fatfs; - } else if #[cfg(feature = "lwext4_rust")] { - pub mod lwext4_rust; + // } else if #[cfg(feature = "lwext4_rust")] { + // pub mod lwext4_rust; } else if #[cfg(feature = "ext4_rs")] { pub mod ext4_rs; } else if #[cfg(feature = "another_ext4")] { diff --git a/modules/ruxfs/src/lib.rs b/modules/ruxfs/src/lib.rs index 312ab626f..b05f6a485 100644 --- a/modules/ruxfs/src/lib.rs +++ b/modules/ruxfs/src/lib.rs @@ -63,9 +63,9 @@ cfg_if::cfg_if! { } else if #[cfg(feature = "fatfs")] { use lazy_init::LazyInit; use alloc::sync::Arc; - } else if #[cfg(feature = "lwext4_rust")] { - use lazy_init::LazyInit; - use alloc::sync::Arc; + // } else if #[cfg(feature = "lwext4_rust")] { + // use lazy_init::LazyInit; + // use alloc::sync::Arc; } else if #[cfg(feature = "ext4_rs")] { use lazy_init::LazyInit; use alloc::sync::Arc; @@ -100,10 +100,10 @@ pub fn init_blkfs(mut blk_devs: AxDeviceContainer) -> MountPoint FAT_FS.init_by(Arc::new(fs::fatfs::FatFileSystem::new(disk))); FAT_FS.init(); let blk_fs = FAT_FS.clone(); - } else if #[cfg(feature = "lwext4_rust")] { - static EXT4_FS: LazyInit> = LazyInit::new(); - EXT4_FS.init_by(Arc::new(fs::lwext4_rust::Ext4FileSystem::new(disk))); - let blk_fs = EXT4_FS.clone(); + // } else if #[cfg(feature = "lwext4_rust")] { + // static EXT4_FS: LazyInit> = LazyInit::new(); + // EXT4_FS.init_by(Arc::new(fs::lwext4_rust::Ext4FileSystem::new(disk))); + // let blk_fs = EXT4_FS.clone(); } else if #[cfg(feature = "ext4_rs")] { static EXT4_FS: LazyInit> = LazyInit::new(); EXT4_FS.init_by(Arc::new(fs::ext4_rs::Ext4FileSystem::new(disk))); diff --git a/ulib/axstd/Cargo.toml b/ulib/axstd/Cargo.toml index 46f31df4b..406b60e5a 100644 --- a/ulib/axstd/Cargo.toml +++ b/ulib/axstd/Cargo.toml @@ -53,7 +53,7 @@ virtio-9p = ["ruxfeat/virtio-9p"] virtio_console = ["ruxfeat/virtio_console"] net-9p = ["ruxfeat/net-9p"] fatfs = ["blkfs", "ruxfeat/fatfs"] -lwext4_rust = ["blkfs", "ruxfeat/lwext4_rust"] +# lwext4_rust = ["blkfs", "ruxfeat/lwext4_rust"] ext4_rs = ["blkfs", "ruxfeat/ext4_rs"] another_ext4 = ["blkfs", "ruxfeat/another_ext4"]