andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-21 23:56:18 +04:00
Code Issues Projects Releases Wiki Activity

Revert part of changes

Browse Source
This commit is contained in:
Jiajie Chen 2020-06-12 08:50:07 +08:00
parent c157890f33
commit 12a29297ba
5 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -1,21 +0,0 @@
.PHONY: all run debug clean user
all:
cd user && make sfsimg
cd kernel && make all
release:
cd user && make sfsimg arch=x86_64 MODE=release
cd kernel && make all ARCH=x86_64 MODE=release && make run ARCH=x86_64
log:
cd user && make sfsimg arch=x86_64 MODE=release
cd kernel && make all ARCH=x86_64 MODE=release && make run ARCH=x86_64 LOG=debug
debug:
cd user && make sfsimg arch=x86_64 MODE=debug
cd kernel && make all ARCH=x86_64 MODE=debug && make clion_debug ARCH=x86_64 MODE=debug LOG=debug
clean:
cd kernel && make clean
cd user && make clean

0
issues.md → docs/2020_OS/issues.md
View File

12
kernel/Cargo.toml
View File

@ -65,12 +65,12 @@ smoltcp = { git = "https://github.com/rcore-os/smoltcp", rev = "5bd87c7c", defau
bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator" } bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator" }
rcore-console = { git = "https://github.com/rcore-os/rcore-console", rev = "b7bacf9", default-features = false } rcore-console = { git = "https://github.com/rcore-os/rcore-console", rev = "b7bacf9", default-features = false }
rcore-memory = { path = "../crate/memory" } rcore-memory = { path = "../crate/memory" }
rcore-thread = { git = "https://github.com/function2-llx/rcore-thread", rev = "8c1022d" } rcore-thread = { git = "https://github.com/rcore-os/rcore-thread", rev = "e00f5ed" }
rcore-fs = { git = "https://github.com/function2-llx/rcore-fs", rev = "f3a4aa0" } rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "1fb7c0ee" }
rcore-fs-sfs = { git = "https://github.com/function2-llx/rcore-fs", rev = "f3a4aa0" } rcore-fs-sfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "1fb7c0ee" }
rcore-fs-ramfs = { git = "https://github.com/function2-llx/rcore-fs", rev = "f3a4aa0" } rcore-fs-ramfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "1fb7c0ee" }
rcore-fs-mountfs = { git = "https://github.com/function2-llx/rcore-fs", rev = "f3a4aa0" } rcore-fs-mountfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "1fb7c0ee" }
rcore-fs-devfs = { git = "https://github.com/function2-llx/rcore-fs", rev = "f3a4aa0" } rcore-fs-devfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "1fb7c0ee" }
compression = { version = "0.1.4", default-features = false, features = ["gzip"] } compression = { version = "0.1.4", default-features = false, features = ["gzip"] }
num = { version = "0.2.1", default-features = false } num = { version = "0.2.1", default-features = false }
num-traits = { version = "0.2.11", default-features = false } num-traits = { version = "0.2.11", default-features = false }

7
kernel/Makefile
View File

@ -245,20 +245,17 @@ run: build justrun
test: build justtest test: build justtest
justrun: justrun:
@sudo $(qemu) $(qemu_opts) @$(qemu) $(qemu_opts)
justtest: justtest:
# unavailable now # unavailable now
@#$(qemu) $(filter-out -serial mon:stdio, $(qemu_opts)) --append $(INIT) -serial file:../tests/stdout -monitor null @#$(qemu) $(filter-out -serial mon:stdio, $(qemu_opts)) --append $(INIT) -serial file:../tests/stdout -monitor null
debug: $(kernel) $(kernel_img) debug: $(kernel) $(kernel_img)
$(qemu) $(qemu_opts) -s -S @$(qemu) $(qemu_opts) -s -S &
@sleep 1 @sleep 1
@$(gdb) $(kernel) -x ../tools/gdbinit @$(gdb) $(kernel) -x ../tools/gdbinit
clion_debug: $(kernel) $(kernel_img)
sudo $(qemu) $(qemu_opts) -s -S
build: $(kernel_img) build: $(kernel_img)
asm: asm:

2
user

@ -1 +1 @@
Subproject commit 8223437f9ba848fde7ea1794bc4e51a44523352c Subproject commit 1bdaf05bb37bd8f38063c5bc935906bf640b07b7