From c46eb2c4be8bfead8be37f53afee6f809008dc75 Mon Sep 17 00:00:00 2001 From: John Doe Date: Tue, 16 Mar 2021 19:09:51 +0800 Subject: [PATCH] build: fix luci-theme-argon package conflicts --- merge_packages.sh | 1 - r1s-h3.config.seed | 4 +++- r1s.config.seed | 2 +- r2s.config.seed | 2 +- r4s.config.seed | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/merge_packages.sh b/merge_packages.sh index c230623..39a707d 100644 --- a/merge_packages.sh +++ b/merge_packages.sh @@ -21,7 +21,6 @@ chmod 600 package/base-files/files/etc/dropbear/* merge_package https://github.com/linkease/ddnsto-openwrt merge_package https://github.com/project-lede/luci-app-godproxy -merge_package https://github.com/jerrykuku/luci-theme-argon luci-theme-argon "-b 18.06" merge_package https://github.com/coolsnowwolf/lede/trunk/package/lean/luci-app-cifsd luci-app-ksmbd merge_package https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index 5edd326..6f4b2a2 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -37,11 +37,13 @@ CONFIG_PACKAGE_luci-app-transmission=y CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-uhttpd=y CONFIG_PACKAGE_luci-app-usb-printer=y +CONFIG_PACKAGE_luci-app-uugamebooster=y CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y -CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-app-argon-config=y +CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-edge=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y diff --git a/r1s.config.seed b/r1s.config.seed index dfde592..554f4ac 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -43,7 +43,7 @@ CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y CONFIG_PACKAGE_luci-app-argon-config=y -CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-edge=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y diff --git a/r2s.config.seed b/r2s.config.seed index 869bead..29d8248 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -43,7 +43,7 @@ CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y CONFIG_PACKAGE_luci-app-argon-config=y -CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-edge=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y diff --git a/r4s.config.seed b/r4s.config.seed index 7db6c09..af16ea3 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -43,7 +43,7 @@ CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y CONFIG_PACKAGE_luci-app-argon-config=y -CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-theme-argonv3=y CONFIG_PACKAGE_luci-theme-edge=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y