diff --git a/Makefile b/Makefile index 3fc697f..a6ffaa2 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,7 @@ busybox: $(busybox) nginx: ifneq ($(arch), riscv32) ifneq ($(shell uname), Darwin) + @echo Building nginx mkdir -p $(out_dir) @cd nginx && make arch=$(arch) all @cp nginx/build/$(arch)/nginx $(out_dir)/nginx @@ -82,6 +83,7 @@ endif redis: ifneq ($(arch), riscv64) ifneq ($(shell uname), Darwin) + @echo Building redis @mkdir -p $(out_dir) @cd redis && make arch=$(arch) all @cp redis/build/$(arch)/redis-server $(out_dir)/redis-server @@ -98,11 +100,13 @@ $(out_img): build rcore-fs-fuse @rcore-fs-fuse $@ $(out_dir) zip $(out_qcow2): $(out_img) + @echo Generating sfsimg @qemu-img convert -f raw $< -O qcow2 $@ @qemu-img resize $@ +1G rcore-fs-fuse: ifeq ($(shell which rcore-fs-fuse),) + @echo Installing rcore-fs-fuse @cargo install rcore-fs-fuse --git https://github.com/rcore-os/rcore-fs --branch sefs endif diff --git a/README.md b/README.md index f57abd4..9eba0b8 100644 --- a/README.md +++ b/README.md @@ -34,17 +34,36 @@ Output to `build/$(arch)` ## Support matrix -| | x86_64 | aarch64 | riscv32 | riscv64 | -| --------------------------- | ------ | ------- | ------- | ------- | -| ucore | n | y | y | y | -| rust | y | y | y | y | -| biscuit | y | y | n | y | -| nginx | y | y | n | y | -| redis (build with redis=on) | y | y | y | n | -| busybox | y | y | n | y | +| | x86_64 | aarch64 | riscv32 | riscv64 | +| ------------------ | ------ | ------- | ------- | ------- | +| ucore | n | y | y | y | +| rust | y | y | y | y | +| biscuit | y | y | n | y | +| nginx (linux only) | y | y | n | y | +| redis (linux only) | y | y | y | n | +| busybox | y | y | n | y | +## How to use Redis + +After running commands above, you should be able to run redis-server in rCore. Then, start `redis-server` in rCore: + +```bash +/> redis-server redis.conf +``` + +Then you should be able to connect to it using `redis-cli`: + +```bash +$ redis-cli -h 10.0.0.2 set abc def +OK +$ redis-cli -h 10.0.0.2 get abc +"def" +``` + +Note: `redis-cli` in rCore is not working at the time. + ## Notice