yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert all mac80211 upgrde

Browse Source
This commit is contained in:
Chuck
2020-05-18 22:40:33 +08:00
parent 4b92f8e966
commit eb1669801e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/r2s_lean_minimal.yml vendored
View File

@@ -124,14 +124,13 @@ jobs:
' >> configs/config_rk3328 ' >> configs/config_rk3328
cd friendlywrt cd friendlywrt
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" 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 remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream master
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs git checkout -b lean upstream/master
git revert --no-edit b65f1ebf0089a2fa0d3e1ad30efc21385a013139 git reset 0a395d6fd6c38c554709197ae3cd6315f143cd7a -- package/kernel/mac80211
git revert --no-edit 2c37fa71f93d150eb67bffdc5bdac8abf5354b16 git commit -m "Revert upgrade mac80211"
git revert --no-edit 23378ed9a481dc73923f5bfa81637a1a8056882d git reset --hard
git revert --no-edit 4787dbaf3cad44b374b660cc0fef9386963e6795 git checkout master-v19.07.1
git revert --no-edit 463b6ac0508de4788a6e41335471ced0a255e1cd git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto lean -X theirs
git revert --no-edit 8faac30089ce616940b3e96c4f4d900aeb6b9fcb
rm target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch 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