update

README.md

@@ -22,7 +22,7 @@
 <a href="https://t.me/opwrts" target="_blank">Telegram</a>
 ### 特色:
 
-+ Cutting edge,openwrt官方master分支版本,luci19.07 内核升级到5.4. 与官方最新源码同步.
++ Cutting edge,openwrt官方openwrt-21.02分支版本, 内核升级到5.4. 与官方最新源码同步.
 
 + 原生极致纯净,固件默认只包含基础上网功能,后台在线选装插件,自建插件仓库囊括了市面上主流开源插件,系统升级不丢失插件和配置.
 
@@ -99,13 +99,13 @@ diy云编译教程: [Read the details in my blog (in Chinese) | 中文教程](ht
  首次编译:
 ```
 screen -S openwrt
-wget -O compile.sh https://raw.githubusercontent.com/garypang13/Actions-OpenWrt/master/onekey/compile.sh && bash compile.sh
+wget -O compile.sh https://raw.githubusercontent.com/garypang13/OpenWrt/master/onekey/compile.sh && bash compile.sh
 ```
 
  二次编译:
 ```
 screen -S openwrt
-wget -O recompile.sh https://raw.githubusercontent.com/garypang13/Actions-OpenWrt/master/onekey/recompile.sh && bash recompile.sh
+wget -O recompile.sh https://raw.githubusercontent.com/garypang13/OpenWrt/master/onekey/recompile.sh && bash recompile.sh
 ```
 
 Build OpenWrt using GitHub Actions
@@ -113,7 +113,7 @@ Build OpenWrt using GitHub Actions
 ### Usage
 
 - Sign up for [GitHub Actions](https://github.com/features/actions/signup)
-- Fork [this GitHub repository](https://github.com/garypang13/Actions-OpenWrt-Nginx)
+- Fork [this GitHub repository](https://github.com/garypang13/OpenWrt)
 - click the `Star` button, and the build will starts automatically.Progress can be viewed on the Actions page.
 - When the build is complete, click the `Artifacts` button in the upper right corner of the Actions page to download the binaries.
 

devices/common/feeds.conf

@@ -1,5 +1,5 @@
-src-git packages https://git.openwrt.org/feed/packages.git
-src-git luci https://git.openwrt.org/project/luci.git
-src-git routing https://git.openwrt.org/feed/routing.git
-src-git telephony https://git.openwrt.org/feed/telephony.git
+src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
+src-git luci https://git.openwrt.org/project/luci.git;openwrt-21.02
+src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
+src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02
 src-git custom https://github.com/garypang13/openwrt-packages.git

devices/common/settings.ini

@@ -1,5 +1,5 @@
 REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="master"
+REPO_BRANCH="openwrt-21.02"
 CONFIG_FILE=".config"
 DIY_SH="diy.sh"
 FREE_UP_DISK="true"

onekey/compile.sh

@@ -40,7 +40,7 @@ fi
 
 
 rm -Rf openwrt
-git clone -b master --depth 1 https://github.com/openwrt/openwrt
+git clone -b openwrt-21.02 --depth 1 https://github.com/openwrt/openwrt
 svn co https://github.com/garypang13/Actions-OpenWrt/trunk/devices openwrt/devices
 cd openwrt
 
@@ -165,7 +165,7 @@ if [ -f sdk1.tar.xz ]; then
 	cp -rf sdk/*/staging_dir/* ./staging_dir/
 	rm -rf sdk sdk1.tar.xz
 	ln -sf /usr/bin/python staging_dir/host/bin/python
-	ln -sf /usr/bin/python staging_dir/host/bin/python3
+	ln -sf /usr/bin/python3 staging_dir/host/bin/python3
 	sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile
 	sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/custom/*/Makefile
 fi

onekey/recompile.sh

@@ -22,8 +22,7 @@ rm -Rf openwrt/common openwrt/files openwrt/devices
 svn co https://github.com/garypang13/Actions-OpenWrt/trunk/devices openwrt/devices
 cd openwrt
 
-git fetch --all
-git reset --hard origin/master
+git checkout .
 
 [ $(grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/.*DEVICE_(.*)=y/\1/') == generic ] && {
  firmware=$(grep '^CONFIG_TARGET.*DEVICE.*=y' .config | sed -r 's/CONFIG_TARGET_(.*)_DEVICE_.*=y/\1/')
@@ -136,7 +135,7 @@ if [ -f sdk1.tar.xz ]; then
 	cp -rf sdk/*/staging_dir/* ./staging_dir/
 	rm -rf sdk sdk1.tar.xz
 	ln -sf /usr/bin/python staging_dir/host/bin/python
-	ln -sf /usr/bin/python staging_dir/host/bin/python3
+	ln -sf /usr/bin/python3 staging_dir/host/bin/python3
 fi
 
 sed -i '/\(tools\|toolchain\)\/Makefile/d' Makefile