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

Update r1s_lean_h3.yml

Browse Source
This commit is contained in:
klever1988
2020-05-02 15:34:19 +08:00
committed by GitHub
parent 1326299aa6
commit aa7b35dce5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,9 @@ jobs:
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 e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing git rebase e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing
git rebase 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto upstream/master -X theirs git rebase 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto upstream/master -X theirs
git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795
git revert --no-edit 463b6ac0508de4788a6e41335471ced0a255e1cd
git revert --no-edit 8faac30089ce616940b3e96c4f4d900aeb6b9fcb
#rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch #rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
git checkout upstream/master -- feeds.conf.default git checkout upstream/master -- feeds.conf.default
sed -i '5s/#src-git/src-git/g' feeds.conf.default sed -i '5s/#src-git/src-git/g' feeds.conf.default