From b25707f3ab723c9900408c8238fc6e7549244b0d Mon Sep 17 00:00:00 2001 From: klever1988 <56048681+klever1988@users.noreply.github.com> Date: Fri, 6 Mar 2020 14:16:01 +0800 Subject: [PATCH] Update r1s_lienol.yml --- .github/workflows/r1s_lienol.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/r1s_lienol.yml b/.github/workflows/r1s_lienol.yml index 55ed340..6a8889f 100644 --- a/.github/workflows/r1s_lienol.yml +++ b/.github/workflows/r1s_lienol.yml @@ -93,12 +93,12 @@ jobs: ./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 ../ + 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 + sed -i '/_CONNTRACK_BROADCAST/d;/_CONNTRACK_CHAIN_EVENTS/d;/_CONNTRACK_MARK/d;/_CONNTRACK_RTCACHE/d;/_CONNTRACK_RTCACHE/d;/_CONNTRACK_ZONES/d' kernel/arch/arm64/configs/sunxi_arm64_defconfig - name: Build SD img run: |