mu2pwryse
/
pebahstq5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/rcore-os/rcore-user into HEAD

Browse Source
master
Harry Chen 6 years ago
parent 60bc1a54d2 88a036dbf0
commit 4f5bbce516
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
Makefile
Unescape View File

@ -87,7 +87,6 @@ endif
endif endif
redis: redis:
ifneq ($(arch), riscv64)
ifneq ($(shell uname), Darwin) ifneq ($(shell uname), Darwin)
@echo Building redis @echo Building redis
@mkdir -p $(out_dir) @mkdir -p $(out_dir)
@ -96,7 +95,6 @@ ifneq ($(shell uname), Darwin)
@cp redis/build/$(arch)/redis-cli $(out_dir)/redis-cli @cp redis/build/$(arch)/redis-cli $(out_dir)/redis-cli
@cp redis/redis.conf $(out_dir)/redis.conf @cp redis/redis.conf $(out_dir)/redis.conf
endif endif
endif
iperf3: iperf3:
ifeq ($(arch), x86_64) ifeq ($(arch), x86_64)

6
README.md
Unescape View File

@ -36,7 +36,7 @@ To build biscuit programs, install musl toolchain first:
# 2.1 for macOS musl toolchain for x86_64(,aarch64) # 2.1 for macOS musl toolchain for x86_64(,aarch64)
$ brew install FileSottile/musl-cross/musl-cross {--with-aarch64} $ brew install FileSottile/musl-cross/musl-cross {--with-aarch64}
# 2.2 for ubuntu 16.04, we should build gcc-musl for newest musl-1.1.21, please see build-gcc-musl.md for instructions # 2.2 for ubuntu 16.04, we should build gcc-musl for newest musl-1.1.21, please see build-gcc-musl.md for instructions
# 2.3 for riscv musl toolchain, please install [musl-riscv-toolchain](https://github.com/jiegec/musl-riscv-toolchain) # 2.3 for riscv musl toolchain, please install [musl-riscv-toolchain](https://github.com/jiegec/musl-riscv-toolchain), however, this one might not be able to build redis on rv64 for lack of libatomic
``` ```
Then, build userspace programs for rCore: Then, build userspace programs for rCore:
@ -57,7 +57,7 @@ A rootfs is created at `build/$(arch)` and converted to `qcow2`.
| rust | ✅ | ✅ | ✅ | ✅ | ✅ | | rust | ✅ | ✅ | ✅ | ✅ | ✅ |
| biscuit | ✅ | ✅ | ❌ | ✅ | ✅ | | biscuit | ✅ | ✅ | ❌ | ✅ | ✅ |
| nginx (linux only) | ✅ | ✅ | ❌ | ✅ | ❓ | | nginx (linux only) | ✅ | ✅ | ❌ | ✅ | ❓ |
| redis (linux only) | ✅ | ✅ | ✅ | ❌ | ❓ | | redis (linux only) | ✅ | ✅ | ✅ | ✅ | ❓ |
| busybox | ✅ | ✅ | ❌ | ✅ | ❓ | | busybox | ✅ | ✅ | ❌ | ✅ | ❓ |
| alpine rootfs | ✅ | ✅ | ❌ | ❌ | ❌ | | alpine rootfs | ✅ | ✅ | ❌ | ❌ | ❌ |
| iperf3 | ✅ | ❌ | ❌ | ❌ | ❓ | | iperf3 | ✅ | ❌ | ❌ | ❌ | ❓ |
@ -66,7 +66,7 @@ A rootfs is created at `build/$(arch)` and converted to `qcow2`.
### How to use Redis ### How to use Redis
If redis is dynamically linked to musl (default if you use commands above), you might need to copy `ld-musl-$(arch).so.1` to rootfs `/lib` . Alpine rootfs includes one as well. If redis is dynamically linked to musl (default if you use commands above), you might need to copy `ld-musl-$(arch).so.1` to rootfs `/lib` by yourself .Alpine rootfs includes one as well.
After building redis, you should be able to run redis-server in rCore. Then, start `redis-server` in rCore: After building redis, you should be able to run redis-server in rCore. Then, start `redis-server` in rCore:

Write Preview
Loading…
Cancel
Save