Skip to content

Commit ad09bbd

Browse files
committed
fix: update package versions to 0.2.2-hv.6 and remove ext4 feature conditional
1 parent 7642636 commit ad09bbd

File tree

4 files changed

+48
-57
lines changed

4 files changed

+48
-57
lines changed

Cargo.lock

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ members = [
3333
]
3434

3535
[workspace.package]
36-
version = "0.2.2-hv.5"
36+
version = "0.2.2-hv.6"
3737
edition = "2024"
3838
authors = ["Yuekai Jia <equation618@gmail.com>"]
3939
license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0"
@@ -44,28 +44,28 @@ keywords = ["arceos", "kernel"]
4444
categories = ["os", "no-std"]
4545

4646
[workspace.dependencies]
47-
axstd = { version = "=0.2.2-hv.5", path = "ulib/axstd" }
48-
axlibc = { version = "=0.2.2-hv.5", path = "ulib/axlibc" }
47+
axstd = { version = "=0.2.2-hv.6", path = "ulib/axstd" }
48+
axlibc = { version = "=0.2.2-hv.6", path = "ulib/axlibc" }
4949

50-
arceos_api = { version = "=0.2.2-hv.5", path = "api/arceos_api" }
51-
arceos_posix_api = { version = "=0.2.2-hv.5", path = "api/arceos_posix_api" }
52-
axfeat = { version = "=0.2.2-hv.5", path = "api/axfeat" }
50+
arceos_api = { version = "=0.2.2-hv.6", path = "api/arceos_api" }
51+
arceos_posix_api = { version = "=0.2.2-hv.6", path = "api/arceos_posix_api" }
52+
axfeat = { version = "=0.2.2-hv.6", path = "api/axfeat" }
5353

54-
axalloc = { version = "=0.2.2-hv.5", path = "modules/axalloc" }
55-
axconfig = { version = "=0.2.2-hv.5", path = "modules/axconfig" }
56-
axdisplay = { version = "=0.2.2-hv.5", path = "modules/axdisplay" }
57-
axdma = { version = "=0.2.2-hv.5", path = "modules/axdma" }
58-
axdriver = { version = "=0.2.2-hv.5", path = "modules/axdriver" }
59-
axfs = { version = "=0.2.2-hv.5", path = "modules/axfs" }
60-
axhal = { version = "=0.2.2-hv.5", path = "modules/axhal" }
61-
axinput = { version = "=0.2.2-hv.5", path = "modules/axinput" }
62-
axipi = { version = "=0.2.2-hv.5", path = "modules/axipi" }
54+
axalloc = { version = "=0.2.2-hv.6", path = "modules/axalloc" }
55+
axconfig = { version = "=0.2.2-hv.6", path = "modules/axconfig" }
56+
axdisplay = { version = "=0.2.2-hv.6", path = "modules/axdisplay" }
57+
axdma = { version = "=0.2.2-hv.6", path = "modules/axdma" }
58+
axdriver = { version = "=0.2.2-hv.6", path = "modules/axdriver" }
59+
axfs = { version = "=0.2.2-hv.6", path = "modules/axfs" }
60+
axhal = { version = "=0.2.2-hv.6", path = "modules/axhal" }
61+
axinput = { version = "=0.2.2-hv.6", path = "modules/axinput" }
62+
axipi = { version = "=0.2.2-hv.6", path = "modules/axipi" }
6363
axlog = { version = "=0.2.2-preview.1", path = "modules/axlog" }
64-
axmm = { version = "=0.2.2-hv.5", path = "modules/axmm" }
65-
axnet = { version = "=0.2.2-hv.5", path = "modules/axnet" }
66-
axruntime = { version = "=0.2.2-hv.5", path = "modules/axruntime" }
67-
axsync = { version = "=0.2.2-hv.5", path = "modules/axsync" }
68-
axtask = { version = "=0.2.2-hv.5", path = "modules/axtask" }
64+
axmm = { version = "=0.2.2-hv.6", path = "modules/axmm" }
65+
axnet = { version = "=0.2.2-hv.6", path = "modules/axnet" }
66+
axruntime = { version = "=0.2.2-hv.6", path = "modules/axruntime" }
67+
axsync = { version = "=0.2.2-hv.6", path = "modules/axsync" }
68+
axtask = { version = "=0.2.2-hv.6", path = "modules/axtask" }
6969

7070
axallocator = { version = "0.1.3-preview.1", features = [
7171
"axerrno",

modules/axfs/src/fs/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
//! Filesystem implementations
1616
17-
#[cfg(feature = "ext4")]
1817
pub mod ext4fs;
1918

2019
pub mod fatfs;

modules/axfs/src/partition.rs

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -415,23 +415,15 @@ pub fn create_filesystem_for_partition(
415415
Ok(Arc::new(fs))
416416
}
417417
Some(FilesystemType::Ext4) => {
418-
#[cfg(feature = "ext4")]
419-
{
420-
info!(
421-
"Creating ext4 filesystem for partition '{}'",
422-
partition.name
423-
);
424-
// Create a partition wrapper
425-
let partition_wrapper =
426-
crate::dev::Partition::new(disk, partition.starting_lba, partition.ending_lba);
427-
let fs = crate::fs::ext4fs::Ext4FileSystem::from_partition(partition_wrapper);
428-
Ok(Arc::new(fs))
429-
}
430-
#[cfg(not(feature = "ext4"))]
431-
{
432-
warn!("ext4 support is not enabled for partition '{}'", partition.name);
433-
Err(AxError::Unsupported)
434-
}
418+
info!(
419+
"Creating ext4 filesystem for partition '{}'",
420+
partition.name
421+
);
422+
// Create a partition wrapper
423+
let partition_wrapper =
424+
crate::dev::Partition::new(disk, partition.starting_lba, partition.ending_lba);
425+
let fs = crate::fs::ext4fs::Ext4FileSystem::from_partition(partition_wrapper);
426+
Ok(Arc::new(fs))
435427
}
436428
Some(FilesystemType::Unknown) | None => {
437429
warn!("Unknown filesystem type for partition '{}'", partition.name);

0 commit comments

Comments
 (0)