From ec216e36f91771f01f482e5e07e3d2608b377102 Mon Sep 17 00:00:00 2001 From: Dekun Zhang <30682790+R3pl4c3r@users.noreply.github.com> Date: Mon, 23 Mar 2020 17:20:01 +0800 Subject: [PATCH] README.md: Optimize English version and code block (#3957) --- README.md | 53 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index d24a34fd2..65fdd9278 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Welcome to Lean's git source of OpenWrt and packages - 注意： - -1. 不要用 root 用户 git 和编译！！！ +1. **不**要用 **root** 用户 git 和编译！！！ 2. 国内用户编译前最好准备好梯子 3. 默认登陆IP 192.168.1.1, 密码 password @@ -14,16 +14,20 @@ Welcome to Lean's git source of OpenWrt and packages - 1. 首先装好 Ubuntu 64bit，推荐 Ubuntu 18 LTS x64 -2. 命令行输入 sudo apt-get update ，然后输入 +2. 命令行输入 `sudo apt-get update` ，然后输入 +` sudo apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3.5 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib +` -3. git clone https://github.com/coolsnowwolf/lede 命令下载好源代码，然后 cd lede 进入目录 +3. 使用 `git clone https://github.com/coolsnowwolf/lede` 命令下载好源代码，然后 `cd lede` 进入目录 -4. ./scripts/feeds update -a +4. ```bash + ./scripts/feeds update -a ./scripts/feeds install -a make menuconfig + ``` -5. 最后选好你要的路由，输入 make -j1 V=s （-j1 后面是线程数。第一次编译推荐用单线程，国内请尽量全局科学上网）即可开始编译你要的固件了。 +5. 最后选好你要的路由，输入 `make -j1 V=s` （-j1 后面是线程数。第一次编译推荐用单线程，国内请尽量全局科学上网）即可开始编译你要的固件了。 本套代码保证肯定可以编译成功。里面包括了 R20 所有源代码，包括 IPK 的。 @@ -52,37 +56,41 @@ sudo apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git ------ -English Version:How to make your Openwrt firmware. +English Version: How to make your Openwrt firmware. - Note: -- -1.DO NOT USE ROOT USER TO CONFIGURE!!! +1. DO **NOT** USE **ROOT** USER TO CONFIGURE!!! -2.Login IP is 192.168.1.1 and login password is "password". +2. Login IP is 192.168.1.1 and login password is "password". Let's start! --- -First,you need a computer with a linux system.It's better to use Ubuntu 14 LTS 64-bit. +First, you need a computer with a linux system. It's better to use Ubuntu 18 LTS 64-bit. Next you need gcc, binutils, bzip2, flex, python3.5+, perl, make, find, grep, diff, unzip, gawk, getopt, subversion, libz-dev and libc headers installed. -To install these program,please login root users and type "sudo apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3.5 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib linux-libc-dev:i386" in terminal +To install these program, please login root users and type +` +sudo apt-get -y install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3.5 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib +` +in terminal -Third,logout of root users.And type this "git clone https://github.com/coolsnowwolf/lede" in terminal to clone this source. +Third, logout of root users. And type this `git clone https://github.com/coolsnowwolf/lede` in terminal to clone this source. -After these please type "cd lede" to cd into the source. +After these please type `cd lede` to cd into the source. -Please Run "./scripts/feeds update -a" to get all the latest package definitions -defined in feeds.conf / feeds.conf.default respectively -and "./scripts/feeds install -a" to install symlinks of all of them into -package/feeds/. +Please Run `./scripts/feeds update -a` to get all the latest package definitions +defined in `feeds.conf` / `feeds.conf.default` respectively +and `./scripts/feeds install -a` to install symlinks of all of them into +`package/feeds/` . -Please use "make menuconfig" to choose your preferred +Please use `make menuconfig` to choose your preferred configuration for the toolchain and firmware. -Use "make menuconfig" to configure your image. +Use `make menuconfig` to configure your image. -Simply running "make" will build your firmware. +Simply running `make` will build your firmware. It will download all sources, build the cross-compile toolchain, the kernel and all choosen applications. @@ -90,7 +98,6 @@ To build your own firmware you need to have access to a Linux, BSD or MacOSX sys (case-sensitive filesystem required). Cygwin will not be supported because of the lack of case sensitiveness in the file system. -Note: Addition Lean's private package source code in ./package/lean directory. Use it under GPL v3. -= -GPLv3 is compatible with more licenses than GPLv2: it allows you to make combinations with code that has specific kinds of additional requirements that are not in GPLv3 itself. Section 7 has more information about this, including the list of additional requirements that are permitted. -= +## Note: Addition Lean's private package source code in `./package/lean` directory. Use it under GPL v3. + +## GPLv3 is compatible with more licenses than GPLv2: it allows you to make combinations with code that has specific kinds of additional requirements that are not in GPLv3 itself. Section 7 has more information about this, including the list of additional requirements that are permitted.