From 0d2d08586a34d83fee7d9ad6199eade81ffe0f64 Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Wed, 19 Feb 2020 23:17:34 +0800 Subject: [PATCH] ReadMe: Update package list information --- ReadMe.md | 90 ++++++++++++++-------------------------------------- ReadMe_en.md | 87 +++++++++++++------------------------------------- 2 files changed, 46 insertions(+), 131 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index b82b623..8cd0972 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -5,7 +5,7 @@ ![SmartDNS](doc/smartdns-banner.png) SmartDNS是一个运行在本地的DNS服务器，SmartDNS接受本地客户端的DNS查询请求，从多个上游DNS服务器获取DNS查询结果，并将访问速度最快的结果返回给客户端，提高网络访问速度。 同时支持指定特定域名IP地址，并高性匹配，达到过滤广告的效果。 -与dnsmasq的all-servers不同，smartdns返回的是访问速度最快的解析结果。 (详细差异请看[FAQ](#faq)) +与dnsmasq的all-servers不同，smartdns返回的是访问速度最快的解析结果。 (详细差异请看[FAQ](#faq)) 支持树莓派，openwrt，华硕路由器，windows等设备。 @@ -134,66 +134,22 @@ rtt min/avg/max/mdev = 5.954/6.133/6.313/0.195 ms |系统 |安装包|说明 |-----|-----|----- -|标准Linux系统(树莓派)| smartdns.xxxxxxxx.armhf.deb|支持树莓派Raspbian stretch，Debian 9系统。 -|标准Linux系统(Armbian arm64)| smartdns.xxxxxxxx.arm64.deb|支持ARM64的Debian stretch，Debian 9系统。 -|标准Linux系统(x86_64)| smartdns.xxxxxxxx.x86_64.tar.gz|支持x86_64 Linux 系统。 -|Windows 10 WSL (ubuntu)| smartdns.xxxxxxxx.x86_64.tar.gz|支持Windows 10 WSL ubuntu系统。 -|标准Linux系统(x86)| smartdns.xxxxxxxx.x86.tar.gz|支持x86系统。 -|华硕原生固件(optware)|smartdns.xxxxxxx.mipsbig.ipk|支持MIPS大端架构的系统，如RT-AC55U, RT-AC66U. -|华硕原生固件(optware)|smartdns.xxxxxxx.mipsel.ipk|支持MIPS小端架构的系统。 -|华硕原生固件(optware)|smartdns.xxxxxxx.arm.ipk|支持arm小端架构的系统，如RT-AC68U。 -|Padavan|smartdns.xxxxxxx.mipselsf.ipk|padavan固件。 -|openwrt 15.01|smartdns.xxxxxxxx.ar71xx.ipk|支持AR71XX MIPS系统。 -|openwrt 15.01|smartdns.xxxxxxxx.ramips_24kec.ipk|支持MT762X等小端路由器 -|openwrt 15.01(潘多拉)|smartdns.xxxxxxxx.mipsel_24kec_dsp.ipk|支持MT7620系列的潘多拉固件 -|openwrt 15.01(潘多拉)|smartdns.xxxxxxxx.mips_74kc_dsp2.ipk|支持AR71xx系列的潘多拉固件 -|openwrt 18.06|smartdns.xxxxxxxx.mips_24kc.ipk|支持AR71XX MIPS系统。 -|openwrt 18.06|smartdns.xxxxxxxx.mipsel_24kc.ipk|支持MT726X等小端路由器 -|openwrt 18.06|smartdns.xxxxxxxx.x86_64.ipk|支持x86_64路由器 -|openwrt 18.06|smartdns.xxxxxxxx.i386_pentium4.ipk|支持x86路由器 -|openwrt 18.06|smartdns.xxxxxxxxxxx.arm_cortex-a9.ipk|支持arm A9核心CPU的路由器 -|openwrt 18.06|smartdns.xxxxxxxxx.arm_cortex-a7_neon-vfpv4.ipk|支持arm A7核心CPU的路由器 -|openwrt LUCI|luci-app-smartdns.xxxxxxxxx.xxxx.all.ipk|openwrt管理统一界面 +|标准Linux系统(树莓派)| smartdns.xxxxxxxx.arm-debian-all.deb|支持树莓派Raspbian stretch，Debian 9系统。 +|标准Linux系统(Armbian arm64)| smartdns.xxxxxxxx.aarch64-debian-all.deb|支持ARM64的Debian stretch，Debian 9系统。 +|标准Linux系统(x86_64)| smartdns.xxxxxxxx.x86_64-linux-all.tar.gz|支持x86_64 Linux 系统。 +|Windows 10 WSL (ubuntu)| smartdns.xxxxxxxx.x86_64-linux-all.tar.gz|支持Windows 10 WSL ubuntu系统。 +|标准Linux系统(x86)| smartdns.xxxxxxxx.x86-linux-all.tar.gz|支持x86系统。 +|optware|smartdns.xxxxxxxx.mips-optware-all.ipk|支持MIPS大端架构的optware系统。 +|optware|smartdns.xxxxxxxx.mipsel-optware-all.ipk|支持MIPS小端架构的optware系统。 +|optware|smartdns.xxxxxxxx.arm-optware-all.ipk|支持arm小端架构的optware系统。 +|openwrt|smartdns.xxxxxxxx.mips-openwrt-all.ipk|支持MIPS大端架构的openwrt系统。 +|openwrt|smartdns.xxxxxxxx.mipsel-openwrt-all.ipk|支持MIPS小端架构的openwrt系统。 +|openwrt|smartdns.xxxxxxxx.arm-openwrt-all.ipk|支持arm小端架构的openwrt系统。 +|openwrt LUCI|luci-app-smartdns.xxxxxxxxx.all.ipk|openwrt管理界面。 +|openwrt LUCI|luci-app-smartdns.xxxxxxxxx.all-luci-compat-all|兼容版本openwrt管理界面, openwrt 18.xx及之前版本安装。 -* openwrt系统CPU架构比较多，上述表格未列出所有支持系统，请查看CPU架构后下载。 -* merlin梅林固件理论和华硕固件一致，所以根据硬件类型安装相应的ipk包即可。（梅林暂时未验证，有问题提交issue） -* CPU架构可在路由器管理界面找到，查看方法： - 登录路由器，点击`System`->`Software`，点击`Configuration` Tab页面，在opkg安装源中可找到对应软件架构，下载路径中可找到，如下，架构为ar71xx - - ```shell - src/gz chaos_calmer_base http://downloads.openwrt.org/chaos_calmer/15.05/ar71xx/generic/packages/base - ``` - -* 或ssh登录系统后通过如下命令查询软件架构： - - * **openwrt系列命令** - - ```shell - opkg print_architecture - ``` - - * **optware系列命令** - - ```shell - ipkg print_architecture - ``` - - * **debian系列命令** - - ```shell - dpkg --print-architecture - ``` - - * **例如** - - 下面的查询结果`arch ar71xx 10`表示ar71xx系列架构，选择`smartdns.xxxxxxxx.ar71xx.ipk`安装包 - - ```shell - root@OpenWrt:~# opkg print_architecture - arch all 1 - arch noarch 1 - arch ar71xx 10 - ``` +* 单独release的软件包为静态编译软件包，无外部依赖，但体积大。若需要小体积软件包，请自行编译或从openwrt/entware仓库获取。 +* 因静态编译，软件包未强制判断CPU架构，安装不正确的软件包将会导致服务无法启动，请获取正确的软件包。 * **请在Release页面下载：[点击此处下载](https://github.com/pymumu/smartdns/releases)** @@ -209,16 +165,16 @@ https://github.com/pymumu/smartdns/releases 1. 安装 - 下载配套安装包`smartdns.xxxxxxxx.armhf.deb`，并上传到Linux系统中。 执行如下命令安装 + 下载配套安装包`smartdns.xxxxxxxx.arm-debian-all.deb`，并上传到Linux系统中。 执行如下命令安装 ```shell - dpkg -i smartdns.xxxxxxxx.armhf.deb + dpkg -i smartdns.xxxxxxxx.arm-debian-all.deb ``` - x86系统下载配套安装包`smartdns.xxxxxxxx.x86-64.tar.gz`, 并上传到Linux系统中。 执行如下命令安装 + x86系统下载配套安装包`smartdns.xxxxxxxx.x86_64-linux-all.tar.gz`, 并上传到Linux系统中。 执行如下命令安装 ```shell - tar zxf smartdns.xxxxxxxx.x86-64.tar.gz + tar zxf smartdns.xxxxxxxx.x86_64-linux-all.tar.gz cd smartdns chmod +x ./install ./install -i @@ -264,7 +220,7 @@ https://github.com/pymumu/smartdns/releases smartdns name = smartdns. ``` -### openwrt/LEDE +### openwrt -------------- @@ -277,6 +233,8 @@ https://github.com/pymumu/smartdns/releases opkg install luci-app-smartdns.xxxxxxxx.xxxx.all.ipk ``` + * 注意： 19.07之前的版本，请安装`luci-app-smartdns.xxxxxxxxx.all-luci-compat-all`界面。 + 1. 修改配置 登录openwrt管理页面，打开`Services`->`SmartDNS`进行配置。 @@ -493,7 +451,7 @@ https://github.com/pymumu/smartdns/releases 1. 安装smartdns - 下载安装包`smartdns.xxxxxxxx.x86_64.tar.gz`，并解压到D盘根目录。解压后目录如下： + 下载安装包`smartdns.xxxxxxxx.x86-linux-all.tar.gz`，并解压到D盘根目录。解压后目录如下： ```shell D:\SMARTDNS diff --git a/ReadMe_en.md b/ReadMe_en.md index 757b6e5..9d97682 100755 --- a/ReadMe_en.md +++ b/ReadMe_en.md @@ -129,66 +129,21 @@ Download the matching version of the SmartDNS installation package. The correspo |system |package|Description |-----|-----|----- -|Standard Linux system (Raspberry Pi)| smartdns.xxxxxxxx.armhf.deb|Support Raspberry Pi Raspbian stretch, Debian 9 system. -|Standard Linux system (Armbian arm64)| smartdns.xxxxxxxx.arm64.deb|Support Armbian debian stretch, Debian 9 system. -|Standard Linux system (x86_64)| smartdns.xxxxxxxx.x86_64.tar.gz|Support for x86_64 Linux systems. -|Windows 10 WSL (Ubuntu)| smartdns.xxxxxxxx.x86_64.tar.gz|Windows 10 WSL ubuntu. -|Standard Linux system (x86)| smartdns.xxxxxxxx.x86.tar.gz|Support for x86_64 systems. -|ASUS native firmware (optware)|smartdns.xxxxxxx.mipsbig.ipk|Systems that support the MIPS big-end architecture, such as RT-AC55U, RT-AC66U. -|ASUS native firmware (optware)|smartdns.xxxxxxx.mipsel.ipk|System that supports the MIPS little endian architecture. -|ASUS native firmware (optware)|smartdns.xxxxxxx.arm.ipk|System that supports the ARM small endian architecture, such as the RT-AC88U, RT-AC68U. -|Padavan|smartdns.xxxxxxx.mipselsf.ipk|padavan Firmware. -|openwrt 15.01|smartdns.xxxxxxxx.ar71xx.ipk|Support AR71XX MIPS system. -|openwrt 15.01|smartdns.xxxxxxxx.ramips_24kec.ipk|Support small-end routers such as MT762X -|openwrt 15.01(Pandora)|smartdns.xxxxxxxx.mipsel_24kec_dsp.ipk|Support for Pandora firmware of MT7620 series -|openwrt 15.01(Pandora)|smartdns.xxxxxxxx.mips_74kc_dsp2.ipk|Support for Pandora firmware of AR71xx series -|openwrt 18.06|smartdns.xxxxxxxx.mips_24kc.ipk|Support AR71XX MIPS system. -|openwrt 18.06|smartdns.xxxxxxxx.mipsel_24kc.ipk|Support small-end routers such as MT726X -|openwrt 18.06|smartdns.xxxxxxxx.x86_64.ipk|Support x86_64 router -|openwrt 18.06|smartdns.xxxxxxxx.i386_pentium4.ipk|Support x86_64 router -|openwrt 18.06|smartdns.xxxxxxxxxxx.arm_cortex-a9.ipk|Router supporting arm A9 core CPU -|openwrt 18.06|smartdns.xxxxxxxxx.arm_cortex-a7_neon-vfpv4.ipk|Router supporting arm A7 core CPU -|openwrt LUCI|luci-app-smartdns.xxxxxxxxx.xxxx.all.ipk|Openwrt management interface +|Standard Linux system (Raspberry Pi)| smartdns.xxxxxxxx.arm-debian-all.deb|Support Raspberry Pi Raspbian stretch, Debian 9 system. +|Standard Linux system (Armbian arm64)| smartdns.xxxxxxxx.aarch64-debian-all.deb|Support Armbian debian stretch, Debian 9 system. +|Standard Linux system (x86_64)| smartdns.xxxxxxxx.x86_64-linux-all.tar.gz|Support for x86_64 Linux systems. +|Windows 10 WSL (ubuntu)| smartdns.xxxxxxxx.x86_64-linux-all.tar.gz|Windows 10 WSL ubuntu. +|Standard Linux system (x86)| smartdns.xxxxxxxx.x86-linux-all.tar.gz|Support for x86_64 systems. +|optware|smartdns.xxxxxxxx.mips-optware-all.ipk|Support the MIPS big-endian architecture for optware。 +|optware|smartdns.xxxxxxxx.mipsel-optware-all.ipk|Support the MIPS little-endian architecture for optware。 +|optware|smartdns.xxxxxxxx.arm-optware-all.ipk|Support the arm architecture for optware。 +|openwrt|smartdns.xxxxxxxx.mips-openwrt-all.ipk|Support the MIPS big-endian architecture for openwrt。 +|openwrt|smartdns.xxxxxxxx.mipsel-openwrt-all.ipk|Support the MIPS little-endian architecture for openwrt。 +|openwrt|smartdns.xxxxxxxx.arm-openwrt-all.ipk|Support the arm architecture for openwrt。 +|openwrt LUCI|luci-app-smartdns.xxxxxxxxx.all.ipk|Openwrt management interface. +|openwrt LUCI|luci-app-smartdns.xxxxxxxxx.all-luci-compat-all|Compat Openwrt management interface for early openwrt. -* The openwrt system supports a lot of CPU architecture. The above table does not list all the supported systems. Please check the CPU architecture and download it. -* The merlin Merlin firmware theory is the same as the ASUS firmware, so install the corresponding ipk package according to the hardware type. (Merlin is not verified yet, and has a problem to submit an issue) -* The CPU architecture can be found in the router management interface: - Log in to the router, click `System`->`Software`, click the `Configuration` tab page, and find the corresponding software architecture in the opkg installation source. The download path can be found, as follows, the architecture is ar71xx - - ```shell - src/gz chaos_calmer_base http://downloads.openwrt.org/chaos_calmer/15.05/ar71xx/generic/packages/base - ``` - -* Or after login to the system, you can query the architecture with the following commands: - - * **Openwrt series commands** - - ```shell - opkg print_architecture - ``` - - * **Optiware series commands** - - ```shell - ipkg print_architecture - ``` - - * **Dedebian Series Order** - - ```shell - dpkg -- print-architecture - ``` - - * **for example** - - The following query result `arch ar71xx 10` represents the ar71xx series architecture, so select the `smartdns.xxxxxxx.ar71xx.ipk` installation package. - - ```shell - Root@OpenWrt:# opkg print_architecture - Arch all 1 - Arch noarch 1 - Arch ar71xx 10 - ``` +* The released packages are statically compiled. If you need a small size package, please compile it yourself or obtain it from the openwrt / entware repository. * **Please download from the Release page: [Download here](https://github.com/pymu/smartdns/releases)** @@ -204,16 +159,16 @@ https://github.com/pymumu/smartdns/releases 1. Installation - Download the installation package like `smartdns.xxxxxxxx.armhf.deb` and upload it to the Linux system. Run the following command to install + Download the installation package like `smartdns.xxxxxxxx.arm-debian-all.deb` and upload it to the Linux system. Run the following command to install ```shell - dpkg -i smartdns.xxxxxxxx.armhf.deb + dpkg -i smartdns.xxxxxxxx.arm-debian-all.deb ``` - For X86-64 system, download the installation package like `smartdns.xxxxxxxx.x86-64.tar.gz` and upload it to the Linux system. Run the following command to install + For X86-64 system, download the installation package like `smartdns.xxxxxxxx.x86_64-linux-all.tar.gz` and upload it to the Linux system. Run the following command to install ```shell - tar zxf smartdns.xxxxxxxx.x86-64.tar.gz + tar zxf smartdns.xxxxxxxx.x86_64-linux-all.tar.gz cd smartdns chmod +x ./install ./install -i @@ -259,7 +214,7 @@ https://github.com/pymumu/smartdns/releases smartdns name = smartdns. ``` -### openwrt/LEDE +### openwrt -------------- @@ -272,6 +227,8 @@ https://github.com/pymumu/smartdns/releases opkg install luci-app-smartdns.xxxxxxxx.xxxx.all.ipk ``` + * Note: For versions before openwrt 19.07, please install `luci-app-smartdns.xxxxxxxxx.all-luci-compat-all` package. + 1. Configuration Log in to the openwrt management page and open `Services`->`SmartDNS` to configure SmartDNS. @@ -488,7 +445,7 @@ Note: Merlin firmware is derived from ASUS firmware and can theoretically be use 1. Install smartdns - download install package `smartdns.xxxxxxxx.x86_64.tar.gz`，and unzip to the `D:\` directory, after decompression, the directory is as follows: + download install package `smartdns.xxxxxxxx.x86_64-linux-all.tar.gz`，and unzip to the `D:\` directory, after decompression, the directory is as follows: ```shell D:\SMARTDNS