From 4d2c961073bd52a06747ec3efc1e278d7784ae8d Mon Sep 17 00:00:00 2001 From: baiqiaosen Date: Thu, 17 Oct 2024 05:29:20 +0000 Subject: [PATCH 1/3] support another_ext4 feature --- .gitignore | 3 +- Cargo.lock | 160 ++++++++++++++++++++------------------- Cargo.toml | 18 ++++- crates/axfeat | 1 + crates/axfs | 1 + crates/axstarry | 1 + crates/axtask | 1 + crates/linux_syscall_api | 1 + crates/taskctx | 1 + scripts/make/features.mk | 3 + zlm_start.sh | 3 + 11 files changed, 113 insertions(+), 80 deletions(-) create mode 160000 crates/axfeat create mode 160000 crates/axfs create mode 160000 crates/axstarry create mode 160000 crates/axtask create mode 160000 crates/linux_syscall_api create mode 160000 crates/taskctx create mode 100755 zlm_start.sh diff --git a/.gitignore b/.gitignore index 7ff8f96..9a3db92 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,4 @@ arceos-fada.bin.gz arceos-fada.itb .tmp_its !tools/rk3588/ramdisk.img -linker_* -crates/ \ No newline at end of file +linker_* \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index d7b9884..0e5348c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -199,7 +199,7 @@ dependencies = [ [[package]] name = "arch_boot" version = "0.1.0" -source = "git+https://github.com/Starry-OS/arch_boot.git#af6f02387de6fe6544e40d5ff254d899314b035c" +source = "git+https://github.com/Starry-OS/arch_boot.git#03cb86283f3bbc3d85c88e37dfc561fe80d24210" dependencies = [ "aarch64-cpu", "axconfig", @@ -211,7 +211,7 @@ dependencies = [ "linux_syscall_api", "log", "of", - "raw-cpuid 11.1.0", + "raw-cpuid 11.2.0", "riscv 0.10.1", "sbi-rt 0.0.2", "tock-registers", @@ -240,9 +240,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axalloc" @@ -257,6 +257,15 @@ dependencies = [ "spinlock", ] +[[package]] +name = "axbacktrace" +version = "0.1.0" +source = "git+https://github.com/kern-crates/axbacktrace.git#c0371ca8ef4a06ff2e21428b33aab51bcbdc16fa" +dependencies = [ + "cfg-if", + "log", +] + [[package]] name = "axconfig" version = "0.1.0" @@ -281,7 +290,7 @@ dependencies = [ [[package]] name = "axdriver" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axdriver.git#fdf9d5efb411cfecfe4cc06bc9517a1fc8f3f7d3" +source = "git+https://github.com/Starry-OS/axdriver.git#9a968311691d3439166d7d2719aa7b98964f57c6" dependencies = [ "axalloc", "axconfig", @@ -307,7 +316,6 @@ dependencies = [ [[package]] name = "axfeat" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axfeat.git#a0d5a4813397aae6ce84a749a1c16955f4e9a874" dependencies = [ "axalloc", "axdisplay", @@ -327,7 +335,6 @@ dependencies = [ [[package]] name = "axfs" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axfs.git#74ba6295c0113d2305d0037ffbae558fa237e846" dependencies = [ "axconfig", "axdriver", @@ -423,7 +430,7 @@ dependencies = [ "page_table_entry", "percpu", "ratio", - "raw-cpuid 11.1.0", + "raw-cpuid 11.2.0", "riscv 0.11.1", "sbi-rt 0.0.3", "spinlock", @@ -489,7 +496,7 @@ dependencies = [ [[package]] name = "axnet" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axnet.git#48d68eb8c32bfb1bb89977fbe19ca42a0d1fb7a9" +source = "git+https://github.com/Starry-OS/axnet.git#da7b71fad8a32c4265c0b23d56bf6f5589e84000" dependencies = [ "axdriver", "axerrno", @@ -509,7 +516,7 @@ dependencies = [ [[package]] name = "axprocess" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axprocess.git#6ab9c7a7d41f43ecebcd6ee329bd9fa7edc763b8" +source = "git+https://github.com/Starry-OS/axprocess.git#8921e976306c71fea940d95f04ab5ef3bdb3ca68" dependencies = [ "axalloc", "axconfig", @@ -535,7 +542,7 @@ dependencies = [ [[package]] name = "axruntime" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axruntime.git#3ff4e76febe8b92ef6f502b1260d05f3fdc498a4" +source = "git+https://github.com/Starry-OS/axruntime.git#0a8b576c156767eeff3ee43a3dab3a1548ffe3ee" dependencies = [ "axalloc", "axconfig", @@ -558,7 +565,7 @@ dependencies = [ [[package]] name = "axsignal" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axsignal.git#2bd62ee3a0a5e7135803315db87df1edc51004ce" +source = "git+https://github.com/Starry-OS/axsignal.git#1cc27325ed3ce8477d10ed0c22af027ce85ca6d3" dependencies = [ "axhal", "bitflags 2.6.0", @@ -569,12 +576,12 @@ dependencies = [ [[package]] name = "axstarry" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axstarry.git#a60752d10eb805a820436b86c429d621a95384ce" dependencies = [ "arch_boot", "axfeat", "axfs", "axlog", + "axtask", "linux_syscall_api", ] @@ -605,8 +612,8 @@ dependencies = [ [[package]] name = "axtask" version = "0.1.0" -source = "git+https://github.com/Starry-OS/axtask.git#4ae6b15a574b5351ac3843d6ef97843164298341" dependencies = [ + "axbacktrace", "axconfig", "axhal", "axlog", @@ -661,9 +668,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "bitflags 2.6.0", "cexpr", @@ -678,7 +685,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.72", + "syn 2.0.79", "which", ] @@ -774,14 +781,14 @@ source = "git+https://github.com/Starry-OS/crate_interface.git#d27dd9608dbf04b31 dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] name = "critical-section" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "f64009896348fc5af4222e9cf7d7d82a95a256c634ebcf61c53e4ea461422242" [[package]] name = "defmt" @@ -803,7 +810,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -818,7 +825,7 @@ dependencies = [ [[package]] name = "driver_block" version = "0.1.0" -source = "git+https://github.com/Starry-OS/driver_block.git#47e771d7d312ad7090d452a0ac95e1d617f13aca" +source = "git+https://github.com/Starry-OS/driver_block.git#077ab12e19b3bdea99b0c8bcb484ceef076965ce" dependencies = [ "driver_common", "log", @@ -941,7 +948,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1034,9 +1041,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "heapless" @@ -1059,12 +1066,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -1107,9 +1114,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" @@ -1135,7 +1142,6 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "linux_syscall_api" version = "0.1.0" -source = "git+https://github.com/Starry-OS/linux_syscall_api.git#bc828f3316e6b4560f5e79602b679c7d9d31d5ff" dependencies = [ "axconfig", "axerrno", @@ -1274,7 +1280,7 @@ source = "git+https://github.com/mexus/numeric-enum-macro#20aef288b2ecd2381ab662 [[package]] name = "of" version = "0.1.0" -source = "git+https://github.com/Starry-OS/of.git#f54b1eeb959605978aa3cdccb014be7ddeba5bb8" +source = "git+https://github.com/Starry-OS/of.git#ae6dc82903a23f2ad7d959beccb7651efe21e935" dependencies = [ "fdt", "lazy_static", @@ -1282,9 +1288,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "page_table" @@ -1332,17 +1338,17 @@ source = "git+https://github.com/Starry-OS/percpu_macros.git#b785b814c5489ac7043 dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1371,18 +1377,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1418,18 +1424,18 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.1.0" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -1439,9 +1445,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -1450,9 +1456,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "riscv" @@ -1495,9 +1501,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -1508,9 +1514,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "sbi-rt" @@ -1561,22 +1567,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1588,7 +1594,7 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "smoltcp" version = "0.11.0" -source = "git+https://github.com/rcore-os/smoltcp.git?rev=b7134a3#b7134a31442db149c2398b27f95a5d2b54414a4d" +source = "git+https://github.com/rcore-os/smoltcp.git?rev=8bf9a9a#8bf9a9a61ce9d50e72b71d541ecb24e29cc5450e" dependencies = [ "bitflags 1.3.2", "byteorder", @@ -1655,9 +1661,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -1667,9 +1673,9 @@ dependencies = [ [[package]] name = "taskctx" version = "0.1.0" -source = "git+https://github.com/Starry-OS/taskctx.git#d7d646ca1f4cc2bd0466563b0563b2c321fb0929" dependencies = [ "aarch64-cpu", + "axconfig", "cfg-if", "log", "memory_addr", @@ -1681,22 +1687,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1718,9 +1724,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.18" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1490595c74d930da779e944f5ba2ecdf538af67df1a9848cbd156af43c1b7cf0" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "toml_datetime", @@ -1729,15 +1735,15 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "version_check" @@ -1862,9 +1868,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.16" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -1950,5 +1956,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] diff --git a/Cargo.toml b/Cargo.toml index fa2521f..1d34b8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,20 @@ -[patch] +[patch."https://github.com/Starry-OS/axfeat.git".axfeat] +path = "crates/axfeat" + +[patch."https://github.com/Starry-OS/axfs.git".axfs] +path = "crates/axfs" + +[patch."https://github.com/Starry-OS/axstarry.git".axstarry] +path = "crates/axstarry" + +[patch."https://github.com/Starry-OS/axtask.git".axtask] +path = "crates/axtask" + +[patch."https://github.com/Starry-OS/linux_syscall_api.git".linux_syscall_api] +path = "crates/linux_syscall_api" + +[patch."https://github.com/Starry-OS/taskctx.git".taskctx] +path = "crates/taskctx" [profile.dev] lto = true diff --git a/crates/axfeat b/crates/axfeat new file mode 160000 index 0000000..a50298f --- /dev/null +++ b/crates/axfeat @@ -0,0 +1 @@ +Subproject commit a50298fc447ea600b9986eaae89a7918186e0060 diff --git a/crates/axfs b/crates/axfs new file mode 160000 index 0000000..ad3e481 --- /dev/null +++ b/crates/axfs @@ -0,0 +1 @@ +Subproject commit ad3e481c76c06810bc3622f896b5f1f52086f075 diff --git a/crates/axstarry b/crates/axstarry new file mode 160000 index 0000000..9b0f0ea --- /dev/null +++ b/crates/axstarry @@ -0,0 +1 @@ +Subproject commit 9b0f0eacfb00faa0b34b531c588b63414c60c797 diff --git a/crates/axtask b/crates/axtask new file mode 160000 index 0000000..2fd6cbe --- /dev/null +++ b/crates/axtask @@ -0,0 +1 @@ +Subproject commit 2fd6cbe14d47b9457257890003206adf987b6337 diff --git a/crates/linux_syscall_api b/crates/linux_syscall_api new file mode 160000 index 0000000..8a5c181 --- /dev/null +++ b/crates/linux_syscall_api @@ -0,0 +1 @@ +Subproject commit 8a5c181d7b1895cea39aca4021c77435b36e8899 diff --git a/crates/taskctx b/crates/taskctx new file mode 160000 index 0000000..f113ede --- /dev/null +++ b/crates/taskctx @@ -0,0 +1 @@ +Subproject commit f113ede78a6653712ae862c6b60bd7eb4223e264 diff --git a/scripts/make/features.mk b/scripts/make/features.mk index aad62bd..c65dcbe 100644 --- 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)) diff --git a/zlm_start.sh b/zlm_start.sh new file mode 100755 index 0000000..5014496 --- /dev/null +++ b/zlm_start.sh @@ -0,0 +1,3 @@ +make clean +./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 From d9db7d7a7032b4e3d90366a7c556bf9d891811f8 Mon Sep 17 00:00:00 2001 From: baiqiaosen Date: Thu, 17 Oct 2024 06:25:11 +0000 Subject: [PATCH 2/3] add crates --- .gitmodules | 2 +- add_crates.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100755 add_crates.sh diff --git a/.gitmodules b/.gitmodules index 0b294d5..bb8a37b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "testcases"] path = testcases - url = https://github.com/Starry-OS/testcases.git + url = https://github.com/Josen-B/testcases.git diff --git a/add_crates.sh b/add_crates.sh new file mode 100755 index 0000000..64c2e6a --- /dev/null +++ b/add_crates.sh @@ -0,0 +1,13 @@ +git clone https://github.com/Josen-B/axfeat.git +git clone https://github.com/Josen-B/axfs.git +git clone https://github.com/Josen-B/axstarry.git +git clone https://github.com/Josen-B/axtask.git +git clone https://github.com/Josen-B/linux_syscall_api.git +git clone https://github.com/Josen-B/taskctx.git +git clone https://github.com/Josen-B/testcases.git +mv axfeat ./crates +mv axfs ./crates +mv axstarry ./crates +mv axtask ./crates +mv linux_syscall_api ./crates +mv taskctx ./crates From 7298bbec7b544530a3bf741da878893e1e8a6348 Mon Sep 17 00:00:00 2001 From: baiqiaosen Date: Wed, 23 Oct 2024 06:58:05 +0000 Subject: [PATCH 3/3] complete README --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index bd98e2d..0907549 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,15 @@ This repository is based on [Starry](https://github.com/Arceos-monolithic/Starry ![avatar](./doc/figures/Starry.svg) +## Run ZLMediaKit +```sh +# add crates to the local +$ ./add_crates.sh + +# Run in a new another_ext4 written in Rust +$ ./zlm_start.sh +``` + ## Build and run ```sh