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
This commit is contained in:
klever1988
2020-04-24 10:25:21 +08:00
committed by GitHub
parent de0bd66bcb
commit 33f1703a6f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,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 8faac30089ce616940b3e96c4f4d900aeb6b9fcb #git revert --no-edit 8faac30089ce616940b3e96c4f4d900aeb6b9fcb
rm target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch rm target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh
git checkout upstream/master -- feeds.conf.default git checkout upstream/master -- feeds.conf.default