Update r1s_lean_h3.yml

This commit is contained in:
klever1988
2020-04-18 07:40:01 +08:00
committed by GitHub
parent be9b98eeed
commit 2b2a6fa187

View File

@@ -60,7 +60,7 @@ jobs:
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 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto upstream/master -X theirs
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
sed -i '5s/#src-git/src-git/g' feeds.conf.default
cd package/lean/