From b7d6e975fc8326a91b852262a7b21298a951506f Mon Sep 17 00:00:00 2001
From: root <root@DESKTOP-0PQNDF5.localdomain>
Date: Sun, 13 Sep 2020 11:41:56 +0800
Subject: [PATCH] maintain package selection

---
 .github/workflows/r2s_native-dev.yml | 1 +
 3_prepare_packages.sh                | 6 ++++--
 app_config.seed                      | 9 ++++++++-
 base_rk3328.seed                     | 3 +--
 minimal_config.seed                  | 7 +++++++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/r2s_native-dev.yml b/.github/workflows/r2s_native-dev.yml
index 454db2ceab..75f13bc66f 100644
--- a/.github/workflows/r2s_native-dev.yml
+++ b/.github/workflows/r2s_native-dev.yml
@@ -42,6 +42,7 @@ jobs:
           echo 'CONFIG_TARGET_rockchip=y
           CONFIG_TARGET_rockchip_armv8=y
           CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y' > .config
+          cat ../base_rk3328.seed >> .config
           cat ../minimal_config.seed >> .config
 
       - name: Compile
diff --git a/3_prepare_packages.sh b/3_prepare_packages.sh
index b157931f77..69a8ae68d2 100644
--- a/3_prepare_packages.sh
+++ b/3_prepare_packages.sh
@@ -1,11 +1,13 @@
 if [[ `pwd` == *"r2s"* ]]; then
   git clone https://github.com/NateLol/luci-app-oled
 fi
-git clone https://github.com/destan19/OpenAppFilter.git
+git clone https://github.com/destan19/OpenAppFilter
 git clone https://github.com/rufengsuixing/luci-app-adguardhome
-git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git
+git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon
 git clone -b 18.06 https://github.com/garypang13/luci-theme-edge 
 git clone https://github.com/xiaoqingfengATGH/luci-theme-infinityfreedom
+git clone https://github.com/pexcn/openwrt-chinadns-ng chinadns-ng
+git clone https://github.com/WuSiYu/luci-app-chinadns-ng
 
 #git clone https://github.com/jerrykuku/lua-maxminddb.git
 #git clone https://github.com/jerrykuku/luci-app-vssr.git
diff --git a/app_config.seed b/app_config.seed
index 6796a02c6f..b7ed4feebb 100644
--- a/app_config.seed
+++ b/app_config.seed
@@ -34,10 +34,10 @@ CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-app-frpc=y
 CONFIG_PACKAGE_luci-app-ipsec-vpnd=y
 CONFIG_PACKAGE_luci-app-netdata=y
+CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-openvpn-server=y
 CONFIG_PACKAGE_luci-app-opkg=y
 CONFIG_PACKAGE_luci-app-pptp-server=y
-CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_PACKAGE_luci-app-samba=y
 CONFIG_PACKAGE_luci-app-softethervpn=y
 CONFIG_PACKAGE_luci-app-sqm=y
@@ -81,10 +81,17 @@ CONFIG_PACKAGE_luci-theme-freifunk-generic=y
 CONFIG_PACKAGE_luci-theme-material=y
 CONFIG_PACKAGE_luci-theme-netgear-mc=y
 CONFIG_PACKAGE_luci-theme-openwrt=y
+CONFIG_PACKAGE_luci-theme-edge=y
+CONFIG_PACKAGE_luci-theme-infinityfreedom=y
 
 CONFIG_PACKAGE_autocore=y
 CONFIG_PACKAGE_zram-swap=y
+CONFIG_PACKAGE_usbutils=y
+CONFIG_PACKAGE_mount-utils=y
+CONFIG_PACKAGE_findutils-find=y
+CONFIG_PACKAGE_findutils-locate=y
 CONFIG_PACKAGE_luci-app-smartdns=y
 CONFIG_PACKAGE_luci-app-wireguard=y
 CONFIG_PACKAGE_luci-app-oaf=y
 CONFIG_PACKAGE_luci-app-oled=y
+CONFIG_PACKAGE_luci-app-chinadns-ng=y
diff --git a/base_rk3328.seed b/base_rk3328.seed
index 0d433ce364..cd92f72093 100644
--- a/base_rk3328.seed
+++ b/base_rk3328.seed
@@ -45,6 +45,5 @@ CONFIG_PACKAGE_unzip=y
 CONFIG_PACKAGE_losetup=y
 CONFIG_PACKAGE_zstd=y
 
-CONFIG_PACKAGE_gcc=y
-CONFIG_PACKAGE_make=y
+CONFIG_PACKAGE_coremark=y
 CONFIG_PACKAGE_i2c-tools=y
diff --git a/minimal_config.seed b/minimal_config.seed
index d42c426ff2..aa37298f68 100644
--- a/minimal_config.seed
+++ b/minimal_config.seed
@@ -5,6 +5,11 @@ CONFIG_OPENSSL_WITH_DTLS=y
 CONFIG_OPENSSL_WITH_EC2M=y
 CONFIG_OPENSSL_WITH_NPN=y
 CONFIG_PACKAGE_autocore=y
+CONFIG_PACKAGE_zram-swap=y
+CONFIG_PACKAGE_usbutils=y
+CONFIG_PACKAGE_mount-utils=y
+CONFIG_PACKAGE_findutils-find=y
+CONFIG_PACKAGE_findutils-locate=y
 CONFIG_PACKAGE_htop=y
 CONFIG_PACKAGE_diffutils=y
 CONFIG_PACKAGE_vim-fuller=y
@@ -14,6 +19,7 @@ CONFIG_PACKAGE_unzip=y
 CONFIG_PACKAGE_losetup=y
 CONFIG_PACKAGE_luci-app-frpc=y
 CONFIG_PACKAGE_luci-app-netdata=y
+CONFIG_PACKAGE_luci-app-nft-qos=y
 CONFIG_LIBSODIUM_MINIMAL=y
 CONFIG_PACKAGE_ddns-scripts_aliyun=y
 CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y
@@ -33,6 +39,7 @@ CONFIG_PACKAGE_luci-app-vssr=y
 CONFIG_PACKAGE_luci-theme-argon=y
 CONFIG_PACKAGE_luci-theme-material=y
 CONFIG_PACKAGE_luci-theme-netgear=y
+CONFIG_PACKAGE_luci-theme-edge=y
 CONFIG_PACKAGE_luci-theme-infinityfreedom=y
 CONFIG_PACKAGE_luci-app-unblockmusic=y
 CONFIG_PACKAGE_kmod-rtl8xxxu=y