From 19aae6d2431d58cb536397b7eb1385340dfe0d04 Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Sun, 2 Aug 2020 02:58:02 +0800 Subject: [PATCH] Update r2s_lean_minimal.yml --- .github/workflows/r2s_lean_minimal.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index 6b9a503..c8a260d 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -127,17 +127,17 @@ 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 checkout upstream/master -b tmp - git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/ + git remote add upstream https://github.com/coolsnowwolf/openwrt && git fetch upstream + git checkout upstream/lede-17.01 -b tmp + #git checkout 33f7cb735300bd9a099995236ed768c8925fec75 -- target/linux/sunxi/image/ git rm README.md git commit -m 'reset' git checkout origin/master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs - git revert 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c -X ours || true + #git revert 33abeff31cfb2ae58adf167c82bd36b5f56a5b1c -X ours || true #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 target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch + rm -f target/linux/rockchip-rk3328/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch sed -i '/ipv6/,+3d' package/base-files/files/root/setup.sh git checkout upstream/master -- feeds.conf.default sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default