Update r2s_lean.yml

This commit is contained in:
klever1988
2020-04-18 12:18:28 +08:00
committed by GitHub
parent 2b2a6fa187
commit 15f85e9486

View File

@@ -63,6 +63,7 @@ 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 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
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
sed -i '5s/#src-git/src-git/g' feeds.conf.default sed -i '5s/#src-git/src-git/g' feeds.conf.default