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-07-06 19:31:22 +08:00
committed by GitHub
parent 49ae500182
commit 80bf27b60a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,9 +127,11 @@ jobs:
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
git checkout upstream/master -b tmp git checkout upstream/master -b tmp
git revert --no-edit 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c #git revert --no-edit 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c
git checkout origin/master-v19.07.1 git checkout origin/master-v19.07.1
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
git add target/linux/sunxi/image/cortex-a53.mk
git rebase --continue
#rm -rf package/kernel/mt76/Makefile package/network/services/hostapd package/kernel/mac80211 #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 #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 rm target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
@@ -173,7 +175,7 @@ jobs:
- name: Add Passwall - name: Add Passwall
run: | run: |
cd friendlywrt-rk3328/friendlywrt cd friendlywrt-rk3328/friendlywrt
echo -e '\nsrc-git lienol https://github.com/SuLingGG/openwrt-package' >> feeds.conf.default echo -e '\nsrc-git lienol https://github.com/Lienol/openwrt-package' >> feeds.conf.default
./scripts/feeds update -a ./scripts/feeds update -a
rm -rf feeds/lienol/lienol/ipt2socks rm -rf feeds/lienol/lienol/ipt2socks
rm -rf feeds/lienol/lienol/shadowsocksr-libev rm -rf feeds/lienol/lienol/shadowsocksr-libev