yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update r2s_lean.yml

Browse Source 
取消官方屏蔽ipv6
This commit is contained in:
klever1988
2020-02-28 21:08:18 +08:00
committed by GitHub
parent 424f21b65b
commit f686c22016
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/r2s_lean.yml vendored
View File

@@ -57,7 +57,7 @@ jobs:
#git apply add_flowoffload.diff #git apply add_flowoffload.diff
cd .. cd ..
. ../remove_unused_config.sh . ../remove_unused_config.sh
sed -i '/iptparser/d' configs/config_rk3328 #sed -i '/iptparser/d' configs/config_rk3328
cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed cat configs/config_rk3328 | grep "TARGET" >> ../base_rk3328.seed
cat ../base_rk3328.seed > configs/config_rk3328 cat ../base_rk3328.seed > configs/config_rk3328
echo ' echo '
@@ -100,6 +100,7 @@ jobs:
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs
git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d
git checkout upstream/master -- feeds.conf.default git checkout upstream/master -- feeds.conf.default
git apply ../../0001-fix-upx.patch git apply ../../0001-fix-upx.patch
cd package/lean/ cd package/lean/