yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix luci-theme-argon package conflicts

Browse Source
This commit is contained in:
John Doe
2021-03-16 19:09:51 +08:00
parent 69ec0a3505
commit c46eb2c4be
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
merge_packages.sh
View File

@@ -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/linkease/ddnsto-openwrt
merge_package https://github.com/project-lede/luci-app-godproxy 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/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/kernel/ksmbd
merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools

4
r1s-h3.config.seed
View File

@@ -37,11 +37,13 @@ CONFIG_PACKAGE_luci-app-transmission=y
CONFIG_PACKAGE_luci-app-ttyd=y CONFIG_PACKAGE_luci-app-ttyd=y
CONFIG_PACKAGE_luci-app-uhttpd=y CONFIG_PACKAGE_luci-app-uhttpd=y
CONFIG_PACKAGE_luci-app-usb-printer=y CONFIG_PACKAGE_luci-app-usb-printer=y
CONFIG_PACKAGE_luci-app-uugamebooster=y
CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vnstat=y
CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-vssr=y
CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-app-zerotier=y
CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=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-edge=y
CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-material=y
CONFIG_PACKAGE_luci-theme-netgear=y CONFIG_PACKAGE_luci-theme-netgear=y

2
r1s.config.seed
View File

@@ -43,7 +43,7 @@ CONFIG_PACKAGE_luci-app-vssr=y
CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-app-zerotier=y
CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y
CONFIG_PACKAGE_luci-app-argon-config=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-edge=y
CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-material=y
CONFIG_PACKAGE_luci-theme-netgear=y CONFIG_PACKAGE_luci-theme-netgear=y

2
r2s.config.seed
View File

@@ -43,7 +43,7 @@ CONFIG_PACKAGE_luci-app-vssr=y
CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-app-zerotier=y
CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y
CONFIG_PACKAGE_luci-app-argon-config=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-edge=y
CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-material=y
CONFIG_PACKAGE_luci-theme-netgear=y CONFIG_PACKAGE_luci-theme-netgear=y

2
r4s.config.seed
View File

@@ -43,7 +43,7 @@ CONFIG_PACKAGE_luci-app-vssr=y
CONFIG_PACKAGE_luci-app-zerotier=y CONFIG_PACKAGE_luci-app-zerotier=y
CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe=y
CONFIG_PACKAGE_luci-app-argon-config=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-edge=y
CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-material=y
CONFIG_PACKAGE_luci-theme-netgear=y CONFIG_PACKAGE_luci-theme-netgear=y