diff --git a/.github/workflows/r2s_lean_minimal-test.yml b/.github/workflows/r2s_lean_minimal-test.yml index 11fbd30..a9242fe 100644 --- a/.github/workflows/r2s_lean_minimal-test.yml +++ b/.github/workflows/r2s_lean_minimal-test.yml @@ -137,9 +137,7 @@ jobs: git commit -m 'reset' git checkout origin/master-v19.07.1 git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs - #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 + curl 'https://git.openwrt.org/?p=openwrt/openwrt.git;a=patch;h=22378beb581b113def1dc392ef75306a2168a163' > ip-full.patch; git apply --reject ip-full.patch || true 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/lede-17.01 -- feeds.conf.default