Merge pull request #40 from Josen-B/main

support another_ext4 feature
Starry-OS · Oct 28, 2024 · ebad07c · ebad07c
2 parents d2e3a74 + f32411e
commit ebad07c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -87,6 +87,12 @@ $ kbuild patch remove axstarry
 $ make A=apps/monolithic_userboot FEATURES=img,sched_rr,e1000_net LOG=off ACCEL=n APP_FEATURES=batch NET=y BLK=y run 
 ```
 
+## Run ZLMediaKit
+```sh
+$ ./build_img.sh -a x86_64 -fs ext4  -s 80 -file x86_64_ZLM
+$ make A=apps/monolithic_userboot FEATURES=another_ext4,img,sched_rr LOG=error NET=y BLK=y ARCH=x86_64 ACCEL=n run
+```
+
 ## Notes
 
 - Please remove unnecessary dependencies in `Cargo.toml` before your commit.

diff --git a/scripts/make/features.mk b/scripts/make/features.mk
@@ -49,6 +49,9 @@ else ifneq ($(findstring monolithic,$(APP)),)
   ifneq ($(filter ext4_rs,$(FEATURES)),)
     override FEATURES += ext4_rs
   endif
+  ifneq ($(filter another_ext4,$(FEATURES)),)
+    override FEATURES += another_ext4
+  endif
 endif
 
 override FEATURES := $(strip $(FEATURES))