diff --git a/.github/workflows/r1s_lean_h3.yml b/.github/workflows/r1s_lean_h3.yml index 336b1b6..a410907 100644 --- a/.github/workflows/r1s_lean_h3.yml +++ b/.github/workflows/r1s_lean_h3.yml @@ -65,9 +65,9 @@ jobs: git checkout master-v18.06.1 git rebase e561fa6fcc2e744c4a8cbfa1b4cf65107a675414^ --onto 1dee4bedde119aadc586ebf7105cfded3c220711 #bypass a commit that cause an error for next rebasing git rebase 52a38e950de0686cb5a2d3e8e05c38027a8e3d0d^ --onto tmp -X theirs - #rm target/linux/allwinner-h5/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch + rm target/linux/generic/hack-4.14/999-net-patch-linux-kernel-to-support-shortcut-fe.patch git checkout upstream/master -- feeds.conf.default - sed -i '5s/#src-git/src-git/g' feeds.conf.default + sed -i -E 's/#(src-git.+)(helloworld.+)/\1\2/' feeds.conf.default cd package/lean/ #git clone https://github.com/jerrykuku/lua-maxminddb.git #git clone https://github.com/jerrykuku/luci-app-vssr.git