From 3d1a222eb81a21f3c14747d1f2133872ccff9a9b Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Mon, 6 Jul 2020 05:39:16 +0800 Subject: [PATCH] Update r2s_lean_minimal.yml --- .github/workflows/r2s_lean_minimal.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index d0742a3..302362c 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -126,7 +126,10 @@ jobs: cd friendlywrt 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 rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs + git checkout upstream/dev-lean-lede -b tmp + git revert --no-edit 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c + git checkout origin/master-v19.07.1 + git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs #rm -rf package/kernel/mt76/Makefile package/network/services/hostapd package/kernel/mac80211 #git checkout 0a395d6fd6c38c554709197ae3cd6315f143cd7a -- package/kernel/mt76/Makefile package/network/services/hostapd package/kernel/mac80211 rm target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch