From eb1669801e974389e7c3a259b430bbf62a40c993 Mon Sep 17 00:00:00 2001 From: Chuck Date: Mon, 18 May 2020 22:40:33 +0800 Subject: [PATCH] revert all mac80211 upgrde --- .github/workflows/r2s_lean_minimal.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index 76f3612..a12f513 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -124,14 +124,13 @@ jobs: ' >> configs/config_rk3328 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 revert --no-edit b65f1ebf0089a2fa0d3e1ad30efc21385a013139 - git revert --no-edit 2c37fa71f93d150eb67bffdc5bdac8abf5354b16 - git revert --no-edit 23378ed9a481dc73923f5bfa81637a1a8056882d - git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795 - git revert --no-edit 463b6ac0508de4788a6e41335471ced0a255e1cd - git revert --no-edit 8faac30089ce616940b3e96c4f4d900aeb6b9fcb + git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream master + git checkout -b lean upstream/master + git reset 0a395d6fd6c38c554709197ae3cd6315f143cd7a -- package/kernel/mac80211 + git commit -m "Revert upgrade mac80211" + git reset --hard + git checkout master-v19.07.1 + git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto lean -X theirs 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 git checkout upstream/master -- feeds.conf.default