From 993ff5283d3d290609d5f72c46e07c7e2f89992f Mon Sep 17 00:00:00 2001
From: John Doe <klever1988@protonmail.com>
Date: Wed, 6 Oct 2021 04:13:35 +0800
Subject: [PATCH] x86: use 18.06

---
 .github/workflows/dispatch.yml | 2 +-
 .github/workflows/lo-test.yml  | 2 +-
 common.seed                    | 3 +++
 r1p.config.seed                | 1 -
 r2c.config.seed                | 1 -
 r2s.config.seed                | 1 -
 r4s.config.seed                | 1 -
 scripts/patches.sh             | 3 +--
 x86.config.seed                | 1 -
 9 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
index e66dac5..f850be2 100644
--- a/.github/workflows/dispatch.yml
+++ b/.github/workflows/dispatch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
         - name: Trigger Compile
           run: |
-            if [ ${{ matrix.device }} = 'r1s' ] OR [ ${{ matrix.device }} = 'x86' ]; then
+            if [ '${{ matrix.device }}' = 'r1s' ] || [ '${{ matrix.device }}' = 'x86' ]; then
               branch='18.06';
             else
               branch='master';
diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml
index 64b46a8..488ae12 100644
--- a/.github/workflows/lo-test.yml
+++ b/.github/workflows/lo-test.yml
@@ -209,7 +209,7 @@ jobs:
           sed -i 's/$(OPKG) install $(BUILD_PACKAGES)/$(OPKG) install --force-overwrite $(BUILD_PACKAGES)/' Makefile
           ls packages/*.ipk | xargs -n1 basename > package.files
           PACKAGES=$(cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE | grep -v CONFIG_PACKAGE_luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i grep -o {} package.files | sort -u | xargs echo)
-          [ $DEVICE != 'r1s' ] && PACKAGES="$PACKAGES luci-i18n-opkg-zh-cn"
+          [ $BRANCH == 'master' ] && PACKAGES="$PACKAGES luci-i18n-opkg-zh-cn"
           make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files"
 
           mkdir -p $GITHUB_WORKSPACE/release
diff --git a/common.seed b/common.seed
index a2851b1..c5999b0 100644
--- a/common.seed
+++ b/common.seed
@@ -59,6 +59,9 @@ CONFIG_PACKAGE_curl=y
 CONFIG_PACKAGE_ddns-scripts_aliyun=y
 CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y
 CONFIG_PACKAGE_ddns-scripts_dnspod=y
+CONFIG_PACKAGE_ddns-scripts-cloudflare=y
+CONFIG_PACKAGE_ddns-scripts-dnspod=y
+CONFIG_PACKAGE_ddns-scripts-dnspod-com=y
 CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
 CONFIG_PACKAGE_fdisk=y
 CONFIG_PACKAGE_frpc=y
diff --git a/r1p.config.seed b/r1p.config.seed
index 017db20..61ba4c5 100644
--- a/r1p.config.seed
+++ b/r1p.config.seed
@@ -25,7 +25,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare=y
 
 
 CONFIG_PACKAGE_kmod-drm-rockchip=y
diff --git a/r2c.config.seed b/r2c.config.seed
index 5f55fd7..0eb5a0f 100644
--- a/r2c.config.seed
+++ b/r2c.config.seed
@@ -25,7 +25,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare=y
 
 
 CONFIG_PACKAGE_kmod-drm-rockchip=y
diff --git a/r2s.config.seed b/r2s.config.seed
index 606984c..402d266 100644
--- a/r2s.config.seed
+++ b/r2s.config.seed
@@ -25,7 +25,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare=y
 
 
 CONFIG_PACKAGE_kmod-drm-rockchip=y
diff --git a/r4s.config.seed b/r4s.config.seed
index 53568ee..5f7a352 100644
--- a/r4s.config.seed
+++ b/r4s.config.seed
@@ -25,7 +25,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare=y
 
 
 CONFIG_PACKAGE_kmod-drm-rockchip=y
diff --git a/scripts/patches.sh b/scripts/patches.sh
index 4800fe3..83e60cc 100644
--- a/scripts/patches.sh
+++ b/scripts/patches.sh
@@ -28,14 +28,13 @@ rm -rf luci-app-ssr-plus/
 mkdir -p `find package/ -follow -type d -path '*/pdnsd-alt'`/patches
 mv $GITHUB_WORKSPACE/patches/99-disallow-aaaa.patch `find package/ -follow -type d -path '*/pdnsd-alt'`/patches
 
-if [ $DEVICE != 'r1s' ]; then
+if [ $BRANCH == 'master' ]; then
 
   # fix po path for snapshot
   find package/ -follow -type d -path '*/po/zh-cn' | xargs dirname | xargs -n1 -i sh -c "rm -f {}/zh_Hans; ln -sf zh-cn {}/zh_Hans"
 
   # remove non-exist package from x86 profile
   sed -i 's/kmod-i40evf//' target/linux/x86/Makefile
-  sed -i 's/KERNEL_PATCHVER:=5.10/KERNEL_PATCHVER:=5.4/' target/linux/x86/Makefile
 
   # enable r2s oled plugin by default
   sed -i "s/enable '0'/enable '1'/" `find package/ -follow -type f -path '*/luci-app-oled/root/etc/config/oled'`
diff --git a/x86.config.seed b/x86.config.seed
index 4be8f01..a272db9 100644
--- a/x86.config.seed
+++ b/x86.config.seed
@@ -24,7 +24,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
 CONFIG_PACKAGE_collectd-mod-ping=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
-CONFIG_PACKAGE_ddns-scripts_cloudflare=y