From 9089a51d7461dcaee03301e12d6d759939cbc1fe Mon Sep 17 00:00:00 2001
From: klever1988 <56048681+klever1988@users.noreply.github.com>
Date: Fri, 6 Mar 2020 13:30:52 +0800
Subject: [PATCH] Update r1s_lienol.yml

---
 .github/workflows/r1s_lienol.yml | 33 +++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml
index 1845282..55ed340 100644
--- a/.github/workflows/r1s_lienol.yml
+++ b/.github/workflows/r1s_lienol.yml
@@ -5,7 +5,7 @@ on:
     branches: 
       - master
     paths:
-      - '.github/workflows/r1s_lienol.yml'
+      - '.github/workflows/r1s_lienol.yml_'
   schedule:
     - cron: 0 0 * * *
 
@@ -76,9 +76,36 @@ jobs:
       - name: Build FriendlyWrt
         run: |
           cd friendlywrt-h5
-          sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
+          cp configs/config_h5 friendlywrt/.config
+          cd friendlywrt
+          make defconfig && make download -j8 && make -s -j$(nproc)
+          	
+      - name: Patch Kernel
+        run: |
+          cd friendlywrt-h5
+          #cd kernel/ && git apply ../../add_fullconenat.diff && cd ../
+          git clone https://github.com/openwrt/openwrt
+          cd openwrt/
+          git checkout 5387bc9cbb9ed205f08766523a296f21dfa83b56
+          rm target/linux/generic/backport-4.14/400-v4.16-leds-trigger-Introduce-a-NETDEV-trigger.patch
+          rm target/linux/generic/pending-4.14/403-mtd-hook-mtdsplit-to-Kbuild.patch
+          rm target/linux/generic/hack-4.14/700-swconfig_switch_drivers.patch
+          ./scripts/patch-kernel.sh ../kernel target/linux/generic/backport-4.14
+          ./scripts/patch-kernel.sh ../kernel target/linux/generic/pending-4.14
+          ./scripts/patch-kernel.sh ../kernel target/linux/generic/hack-4.14
+          cd ../kernel && git checkout -- drivers/mtd/
+          cd ../
+          wget https://github.com/torvalds/linux/raw/master/scripts/kconfig/merge_config.sh && chmod +x merge_config.sh
+          find friendlywrt/ -type f -name .config.override -exec cp {} ../ \;
+          grep -i 'FILTER_\|FLOW' ../.config.override > .config.override
+          ./merge_config.sh -m .config.override kernel/arch/arm64/configs/sunxi_arm64_defconfig && mv .config kernel/arch/arm64/configs/sunxi_arm64_defconfig
+          
+      - name: Build SD img
+        run: |
+          cd friendlywrt-h5
+          sed -i '130,150 {/build_friendlywrt/d}' scripts/build.sh
           ./build.sh nanopi_r1s.mk
-      
+
       - name: Zip Files
         run: |
           gzip friendlywrt-h5/out/*.img