From 2bab496e44df8edfcac3fef51d04eb755a99b225 Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Tue, 23 Jan 2018 12:23:15 +0800 Subject: [PATCH 1/2] Bump version 2.2.0 Signed-off-by: Jianhui Zhao --- README.md | 2 +- README_ZH.md | 2 +- src/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6629896..fd50f22 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [4]: https://github.com/zhaojh329/rtty/pulls [5]: https://img.shields.io/badge/Issues-welcome-brightgreen.svg?style=plastic [6]: https://github.com/zhaojh329/rtty/issues/new -[7]: https://img.shields.io/badge/release-2.1.0-blue.svg?style=plastic +[7]: https://img.shields.io/badge/release-2.2.0-blue.svg?style=plastic [8]: https://github.com/zhaojh329/rtty/releases [9]: https://travis-ci.org/zhaojh329/rtty.svg?branch=master [10]: https://travis-ci.org/zhaojh329/rtty diff --git a/README_ZH.md b/README_ZH.md index 3df5f17..b1cff34 100755 --- a/README_ZH.md +++ b/README_ZH.md @@ -6,7 +6,7 @@ [4]: https://github.com/zhaojh329/rtty/pulls [5]: https://img.shields.io/badge/Issues-welcome-brightgreen.svg?style=plastic [6]: https://github.com/zhaojh329/rtty/issues/new -[7]: https://img.shields.io/badge/release-2.1.0-blue.svg?style=plastic +[7]: https://img.shields.io/badge/release-2.2.0-blue.svg?style=plastic [8]: https://github.com/zhaojh329/rtty/releases [9]: https://travis-ci.org/zhaojh329/rtty.svg?branch=master [10]: https://travis-ci.org/zhaojh329/rtty diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 88f6da3..9dc802a 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,7 @@ add_definitions(-O -Wall -Werror --std=gnu99 -D_GNU_SOURCE) # The version number. set(RTTY_VERSION_MAJOR 2) -set(RTTY_VERSION_MINOR 1) +set(RTTY_VERSION_MINOR 2) set(RTTY_VERSION_PATCH 0) # Check the third party Libraries From 351809e5577cb045cea39f31e244e08981201ec7 Mon Sep 17 00:00:00 2001 From: Jianhui Zhao Date: Tue, 23 Jan 2018 16:18:32 +0800 Subject: [PATCH 2/2] Update README Signed-off-by: Jianhui Zhao --- README.md | 27 ++++++++++++++------------- README_ZH.md | 26 ++++++++++++++------------ 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index fd50f22..fa072ef 100755 --- a/README.md +++ b/README.md @@ -120,23 +120,23 @@ Query online devices You need to cross compiling by yourself ## For OpenWRT -add new feed into "feeds.conf.default": +Update feeds: - src-git libuwsc https://github.com/zhaojh329/libuwsc-feed.git - src-git rtty https://github.com/zhaojh329/rtty-feed.git + ./scripts/feeds update -a + ./scripts/feeds install -a +For chaos_calmer(15.05), you need to modify the Makefile: feeds/packages/utils/rtty/Makefile -for chaos_calmer(15.05) + PKG_SOURCE_PROTO:=git + PKG_SOURCE_VERSION:=v$(PKG_VERSION) + PKG_SOURCE_URL=https://github.com/zhaojh329/rtty.git + # Add the following two lines + PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz + # And comment the line below + #PKG_MIRROR_HASH:=23a203351fdd47acfd16d3c3b3e3d51dd65a5d9e8ca89d4b1521d40c40616102 - src-git libuwsc https://github.com/zhaojh329/libuwsc-feed.git;for-15.05 - src-git rtty https://github.com/zhaojh329/rtty-feed.git;for-15.05 - -Install rtty packages: - - ./scripts/feeds update libuwsc rtty - ./scripts/feeds install -a -p rtty - -Select package rtty in menuconfig and compile new image. +Select rtty in menuconfig and compile new image. Utilities ---> Terminal ---> @@ -147,6 +147,7 @@ Select package rtty in menuconfig and compile new image. Configuring the server parameter + uci add rtty rtty # If it's the first configuration uci set rtty.@rtty[0].host='your server host' uci set rtty.@rtty[0].port='your server port' diff --git a/README_ZH.md b/README_ZH.md index b1cff34..e8d5037 100755 --- a/README_ZH.md +++ b/README_ZH.md @@ -119,22 +119,23 @@ rtty非常适合远程维护你的或者你公司的部署在全球各地的成 你需要自行交叉编译 ## 如何在OpenWRT中使用 -add new feed into "feeds.conf.default": +Update feeds: - src-git libuwsc https://github.com/zhaojh329/libuwsc-feed.git - src-git rtty https://github.com/zhaojh329/rtty-feed.git + ./scripts/feeds update -a + ./scripts/feeds install -a -for chaos_calmer(15.05) +对于chaos_calmer(15.05), 你需要修改Makefile: feeds/packages/utils/rtty/Makefile - src-git libuwsc https://github.com/zhaojh329/libuwsc-feed.git;for-15.05 - src-git rtty https://github.com/zhaojh329/rtty-feed.git;for-15.05 + PKG_SOURCE_PROTO:=git + PKG_SOURCE_VERSION:=v$(PKG_VERSION) + PKG_SOURCE_URL=https://github.com/zhaojh329/rtty.git + # Add the following two lines + PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz + # And comment the line below + #PKG_MIRROR_HASH:=23a203351fdd47acfd16d3c3b3e3d51dd65a5d9e8ca89d4b1521d40c40616102 -Install rtty packages: - - ./scripts/feeds update libuwsc rtty - ./scripts/feeds install -a -p rtty - -Select package rtty in menuconfig and compile new image. +在menuconfig中选择rtty，然后重新编译固件。 Utilities ---> Terminal ---> @@ -145,6 +146,7 @@ Select package rtty in menuconfig and compile new image. 配置服务器参数 + uci add rtty rtty # If it's the first configuration uci set rtty.@rtty[0].host='your server host' uci set rtty.@rtty[0].port='your server port'