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

Update r2s_lean_minimal.yml

Browse Source
This commit is contained in:
klever1988
2020-05-19 02:51:06 +08:00
committed by GitHub
parent eb1669801e
commit 61a6956f38
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,13 +124,9 @@ 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 master git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
git checkout -b lean upstream/master git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs
git reset 0a395d6fd6c38c554709197ae3cd6315f143cd7a -- package/kernel/mac80211 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 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