diff --git a/.github/workflows/r2s_lean.yml b/.github/workflows/r2s_lean.yml index 360978c..e1437db 100644 --- a/.github/workflows/r2s_lean.yml +++ b/.github/workflows/r2s_lean.yml @@ -44,6 +44,8 @@ jobs: repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m rk3328.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle #cp ../rk3328-19.xml .repo/manifests/rk3328.xml repo sync -c --no-clone-bundle + rm -rf friendlywrt/ + git clone https://github.com/friendlyarm/friendlywrt - name: Mods run: | @@ -85,6 +87,7 @@ jobs: 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 rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto upstream/master -X theirs + git cherry-pick origin/master-v19.07.1 aea926c37bf7fbaf6a9fd4142d29b2f9c659cc01^...origin/master-v19.07.1 git checkout upstream/master -- feeds.conf.default git apply ../../0001-fix-upx.patch sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings