From 06f4ce3b6deae70f35f554b3296b14c0a888c8a9 Mon Sep 17 00:00:00 2001 From: chyyuu Date: Sat, 3 Feb 2018 22:36:41 +0800 Subject: [PATCH] Update README-english.md --- README-english.md | 53 ++++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/README-english.md b/README-english.md index aba5286..ebc1507 100644 --- a/README-english.md +++ b/README-english.md @@ -3,10 +3,15 @@ INTRODUCTION ucore labs was used as OS Experiments in OS Course Of Dept. of Computer Science & Technology, Tsinghua University. ucore is a teaching OS which is derived from xv6&jos in MIT, OS161 in Harvard and Linux. + ucore was developed and used in Department of Computer Science & Technology, Institute for Interdisciplinary Information Sciences, Tsinghua University. + The codes in the files that constitute xv6&jos are Copyright (2006-Current) Frans Kaashoek, Robert Morris, and Russ Cox and uses MIT License. + The codes in the files that constitute OS/161 are written by David A. Holland. + The codes in the files that constitute ucore are Copyright (2010-Current) Yu Chen, Naizheng Wang, Yong Xiang and uses GPL License. + The documents in the files that constitute ucore are Copyright (2010-Current) Yu Chen, Yong Xiang and uses Creative Commons Attribution/Share-Alike (CC-BY-SA) License. MAINTAINERS @@ -23,6 +28,7 @@ CONTENTS labs info ---------------- +``` lab0: preparing lab1: boot/protect mode/stack/interrupt lab2: physical memory management @@ -32,9 +38,11 @@ lab5: user process management lab6: scheduling lab7: mutex/sync lab8: filesystem +``` WORK IN MS WINDOWS ================== +``` Working in Linux is encouraged. But If you like to work in MS Windows, we provide virtual machine environment (Runnint Ubuntu in VirtualBox) in Windows to help you to finish the labs. If you don't want to install ubuntu and other softs to finish these labs in Windows, you can use VirtualBox soft (https://www.virtualbox.org/) and a virtual disk image with all these softs. Below example is shown how to setup lab environment in Windows. @@ -59,21 +67,25 @@ username: chy password: After you login, you will see the directory ucore_lab in HOME directory. +``` TESTED ENVIRONMENT ================== -UBUNTU 14.04: GCC-4.8.2 CLANG-3.5 -FEDORA 20: GCC-4.8.2 +``` +UBUNTU 14.04+: GCC-4.8.2+ CLANG-3.5+ +FEDORA 20+: GCC-4.8.2+ +``` EXERCISE STEPS ============== +``` 0 Get the newest os lab src codes/docs.(Insure you can connect to github in ubuntu running on VrtualBox) 0.1 If you try to get all codes $rm -rf ucore_lab - $git clone git://github.com/chyyuu/ucore_lab.git + $git clone git://github.com/chyyuu/ucore_os_lab.git $cd ucore_lab 0.2 If you gloned ucore_lab and only try to get the updated codes - $cd ucore_lab + $cd ucore_os_lab $git pull 1 $cd labX 2 read codes (specially the modified or added files) @@ -90,6 +102,7 @@ OR 7 handin your code $make handin +``` OPTION ============== @@ -100,44 +113,26 @@ then you will use clang to compile ucore GRADE/RANK ========== +``` Superman: Finish all OS labs in one month by yourself Master: Finish all OS labs in two month by yourself Veteran: Finish all OS labs in three month by yourself Apprentice: Finish all OS labs in one semester with other guy's help +``` RESOURCE REPOSITORY =================== +``` Basic OS labs (for students who learn OS course) -The newest lab codes and docs is in https://github.com/chyyuu/ucore_lab +The newest lab codes and docs is in https://github.com/chyyuu/ucore_os_lab Advanced OS labs (for OS geeks or hackers or guys with Superman/Master Rank) The newest lab codes and docs is in https://github.com/chyyuu/ucore_plus +``` -LEARNING DISSCUSS GROUPS -======================== - -os learning group based on QQ -------------------------------- -QQ id: 181873534 - -general discuss --------------------------------- -If you have any questions about ucore basic os labs, -you can subscribe to the Google Groups "os-course" group (http://groups.google.com/group/oscourse?hl=en.) -To post to this group, send email to oscourse@googlegroups.com. -To unsubscribe from this group, send email to oscourse+unsubscribe@googlegroups.com. -For more options, visit this group at http://groups.google.com/group/oscourse?hl=en. - -DEVELOPMENT DISCUSS GROUPS -========================== -If you have any questions about ucore advanced os labs, -If you want to be a developer of ucore or pay attention to the development of ucore, -you can subscribe to the Google Groups "ucore_dev" group (http://groups.google.com/group/ucore_dev?hl=en.) -To post to this group, send email to ucore_dev@googlegroups.com. -To unsubscribe from this group, send email to ucore_dev+unsubscribe@googlegroups.com. -For more options, visit this group at http://groups.google.com/group/ucore_dev?hl=en. UCORERS (Contributors) ====================== + Junjie Mao, Yuheng Chen, Cong Liu, Yang Yang, Zhun Qu, Shengwei Ren, Wenlei Zhu, Cao Zhang, Tong Sen, Xu Chen, -Cang Nan, Yujian Fang, Wentao Han, Kaichen Zhang, Xiaolin Guo, Tianfan Xue, Gang Hu, Cao Liu, Yu Su,Xinhao Yuan, ... +Cang Nan, Yujian Fang, Wentao Han, Kaichen Zhang, Xiaolin Guo, Tianfan Xue, Gang Hu, Cao Liu, Yu Su,Xinhao Yuan, Wei Zhang, Kaixiang Lei...