feat: support ext4fs by @yuoo655

Starry-OS · Jun 3, 2024 · eaf2e03 · eaf2e03
1 parent 7f84d09
commit eaf2e03
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -158,4 +158,6 @@ jobs:
       run: |
         sh ./build_img.sh -a ${{ matrix.arch }} -fs ext4
         export MONOLITHIC_TESTCASE=other
-        make ARCH=${{ matrix.arch }} A=apps/monolithic_userboot APP_FEATURES=batch FEATURES="ext4fs" LOG=off ACCEL=n run
+        make ARCH=${{ matrix.arch }} A=apps/monolithic_userboot APP_FEATURES=batch FEATURES="lwext4_rust" LOG=off ACCEL=n run
+        make clean
+        make ARCH=${{ matrix.arch }} A=apps/monolithic_userboot APP_FEATURES=batch FEATURES="ext4_rs" LOG=off ACCEL=n run
diff --git a/platforms/x86_64-qemu-q35.toml b/platforms/x86_64-qemu-q35.toml
@@ -39,7 +39,7 @@ timer-frequency = "4_000_000_000"   # 4.0GHz
 # Testcase memory start address.
 testcase-memory-start = "0x1_8000_0000"
 # Testcase memory size.
-testcase-memory-size = "0x800_0000"
+testcase-memory-size = "0x1700_0000"
 # The base address of the user heap.
 user-heap-base = "0x3FA0_0000"
 # The base address of the user stack. And the stack bottom is `user-stack-top + max-user-stack-size`.

diff --git a/scripts/make/build.mk b/scripts/make/build.mk
@@ -32,8 +32,6 @@ endif
 
 _cargo_build: $(build_deplibs)
 	@printf "    $(GREEN_C)Building$(END_C) App: $(APP_NAME), Arch: $(ARCH), Platform: $(PLATFORM_NAME), App type: $(APP_TYPE)\n"
-ifneq ($(filter ext4fs,$(FEATURES)),)
-endif
 ifeq ($(APP_TYPE), rust)
 	$(call cargo_build,--manifest-path $(APP)/Cargo.toml,$(AX_FEAT) $(LIB_FEAT) $(APP_FEAT))
 	@cp $(rust_elf) $(OUT_ELF)

diff --git a/scripts/make/features.mk b/scripts/make/features.mk
@@ -43,8 +43,11 @@ else ifneq ($(findstring monolithic,$(APP)),)
   ifneq ($(filter fs net pipe select epoll,$(FEATURES)),)
     override FEATURES += fd
   endif
-  ifeq ($(filter ext4fs,$(FEATURES)),)
-    override FEATURES += fatfs
+  ifeq ($(filter lwext4_rust,$(FEATURES)),)
+    override FEATURES += lwext4_rust
+  endif
+  ifeq ($(filter ext4_rs,$(FEATURES)),)
+    override FEATURES += ext4_rs
   endif
 endif