update script

.github/workflows/r2s_lean.yml

@@ -14,6 +14,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    if: github.event.repository.owner.id == 56048681
 
     steps:
 
@@ -41,24 +42,13 @@ jobs:
         run: |
           mkdir friendlywrt-rk3328
           cd friendlywrt-rk3328
-          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
+          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 --depth=1
-          repo sync -c --no-clone-bundle -j8
+          repo sync -c --no-tags --no-clone-bundle -j8
+          cd friendlywrt/ && git fetch --unshallow
 
       - name: Patch Kernel
         run: |
-          cd friendlywrt-rk3328
+          . patch_kernel_5.4.22.sh
-          cd kernel/ && git apply ../../add_fullconenat.diff && cd ../
-          git clone https://github.com/openwrt/openwrt
-          rm openwrt/target/linux/generic/pending-5.4/403-mtd-hook-mtdsplit-to-Kbuild.patch
-          rm openwrt/target/linux/generic/hack-5.4/700-swconfig_switch_drivers.patch
-          cd openwrt/
-          ./scripts/patch-kernel.sh ../kernel target/linux/generic/backport-5.4
-          ./scripts/patch-kernel.sh ../kernel target/linux/generic/pending-5.4
-          ./scripts/patch-kernel.sh ../kernel target/linux/generic/hack-5.4
-          cd ../
-          wget https://github.com/torvalds/linux/raw/master/scripts/kconfig/merge_config.sh && chmod +x merge_config.sh
-          grep -i '_NETFILTER_\|FLOW' ../.config.override > .config.override
-          ./merge_config.sh -m .config.override kernel/arch/arm64/configs/nanopi-r2_linux_defconfig && mv .config kernel/arch/arm64/configs/nanopi-r2_linux_defconfig
 
       - name: Mods
         run: |
@@ -88,7 +78,9 @@ jobs:
           rm -rf luci-theme-argon
           git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git
           cd ../../
-          sed -i '/exit/i\mv /etc/rc.d/S25dockerd /etc/rc.d/S92dockerd && sed -i "s/START=25/START=92/g" S92dockerd' package/lean/default-settings/files/zzz-default-settings
+          git apply ../../enable_autocore.diff
+          #sed -i '/exit/i\mv /etc/rc.d/S25dockerd /etc/rc.d/S92dockerd && sed -i "s/START=25/START=92/g" S92dockerd' package/lean/default-settings/files/zzz-default-settings
+          sed -i '/exit/i\/etc/init.d/dockerd disabled' package/lean/default-settings/files/zzz-default-settings
           sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings
           sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings
           #sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config