diff --git a/.github/workflows/r2s_lean_minimal-dev.yml b/.github/workflows/r2s_lean_minimal-dev.yml index 961d9f6..7497769 100644 --- a/.github/workflows/r2s_lean_minimal-dev.yml +++ b/.github/workflows/r2s_lean_minimal-dev.yml @@ -131,10 +131,12 @@ jobs: 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 checkout upstream/master -b tmp + git reset --hard aed7fc6131c5bf4ed39ff5194a144ba00057f828 + rm -r target/linux/sunxi/image git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/ git rm README.md git commit -m 'reset' - git checkout origin/master-v19.07.1 + git checkout master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh