fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default-settings: split cnh variant into a separated pkg

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-11-29 00:02:23 +08:00
parent f763a22235
commit 75954bd23a
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/target.mk
View File

@ -51,7 +51,7 @@ DEFAULT_PACKAGES.router:=\
# For easy usage # For easy usage
DEFAULT_PACKAGES.tweak:=\ DEFAULT_PACKAGES.tweak:=\
block-mount \ block-mount \
default-settings \ default-settings-chn \
kmod-ipt-raw \ kmod-ipt-raw \
kmod-nf-nathelper \ kmod-nf-nathelper \
kmod-nf-nathelper-extra \ kmod-nf-nathelper-extra \

19
package/emortal/default-settings/Makefile
View File

@ -16,8 +16,6 @@ PKG_RELEASE:=$(COMMITCOUNT)
PKG_LICENSE:=GPL-3.0 PKG_LICENSE:=GPL-3.0
PKG_CONFIG_DEPENDS:=CONFIG_DEFAULT_SETTINGS_OPTIMIZE_FOR_CHINESE
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/default-settings define Package/default-settings
@ -28,15 +26,10 @@ define Package/default-settings
DEPENDS:=+luci-base +@LUCI_LANG_en DEPENDS:=+luci-base +@LUCI_LANG_en
endef endef
define Package/default-settings/config define Package/default-settings-chn
config DEFAULT_SETTINGS_OPTIMIZE_FOR_CHINESE $(Package/default-settings)
bool "Optimize for mainland China users" TITLE+= (Optimize for CHN users)
select LUCI_LANG_zh-cn DEPENDS:=+default-settings +@LUCI_LANG_zh-cn
default y
endef
define Package/default-settings/description
Language Support Packages.
endef endef
define Build/Compile define Build/Compile
@ -48,8 +41,9 @@ define Package/default-settings/install
$(INSTALL_DIR) $(1)/etc/uci-defaults $(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings $(INSTALL_BIN) ./files/zzz-default-settings $(1)/etc/uci-defaults/99-default-settings
endef
ifeq ($(CONFIG_DEFAULT_SETTINGS_OPTIMIZE_FOR_CHINESE),y) define Package/default-settings-chn/install
$(INSTALL_BIN) ./files/zzz-default-settings-chinese $(1)/etc/uci-defaults/99-default-settings-chinese $(INSTALL_BIN) ./files/zzz-default-settings-chinese $(1)/etc/uci-defaults/99-default-settings-chinese
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
@ -59,3 +53,4 @@ endif
endef endef
$(eval $(call BuildPackage,default-settings)) $(eval $(call BuildPackage,default-settings))
$(eval $(call BuildPackage,default-settings-chn))