| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 |
- --- a/feeds/luci/luci.mk
- +++ b/feeds/luci/luci.mk
- @@ -82,7 +82,7 @@ define findrev
- set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- $(if $(1),. ':(exclude)po',po)); \
- if [ -n "$$1" ]; then
- secs="$$(($$1 % 86400))"; \
- - yday="$$(date --utc --date="@$$1" "+%y.%j")"; \
- + yday="$$(date --utc --date="@$$(($$1 + 365*24*60*60))" "+%y.%j")"; \
- printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2"; \
- else \
- echo "unknown"; \
- @@ -207,9 +207,20 @@ define Package/$(PKG_NAME)/install
- $(call Build/Install/Default)
- $(CP) $(PKG_INSTALL_DIR)/* $(1)/
- endif
- + ifneq ($(wildcard ${CURDIR}/po),)
- + $(INSTALL_DIR) $(1)/etc/uci-defaults
- + echo "uci set luci.languages.zh_cn='$(LUCI_LANG.zh_Hans)'; uci commit luci" \
- + > $(1)/etc/uci-defaults/luci-i18n-$(LUCI_BASENAME)-zh-cn
- + $(INSTALL_DIR) $(1)$(LUCI_LIBRARYDIR)/i18n
- + $(foreach po,$(wildcard ${CURDIR}/po/zh_Hans/*.po), \
- + po2lmo $(po) \
- + $(1)$(LUCI_LIBRARYDIR)/i18n/$(basename $(notdir $(po))).zh-cn.lmo;)
- + endif
- +
- endef
-
- ifndef Package/$(PKG_NAME)/postinst
- +ifneq ($(wildcard ${CURDIR}/htdocs/luci-static/resources/view),)
- define Package/$(PKG_NAME)/postinst
- [ -n "$${IPKG_INSTROOT}" ] || { \
- rm -f /tmp/luci-indexcache.*
- @@ -218,6 +229,16 @@ define Package/$(PKG_NAME)/postinst
- exit 0
- }
- endef
- +else
- +define Package/$(PKG_NAME)/postinst
- +[ -n "$${IPKG_INSTROOT}" ] || {$(foreach script,$(LUCI_DEFAULTS),
- + (. /etc/uci-defaults/$(script)) && rm -f /etc/uci-defaults/$(script))
- + rm -f /tmp/luci-indexcache.*
- + rm -rf /tmp/luci-modulecache/
- + exit 0
- +}
- +endef
- +endif
- endif
-
- # some generic macros that can be used by all packages
- @@ -334,5 +355,5 @@ define LuciTranslation
-
- endef
-
- -$(foreach lang,$(LUCI_LANGUAGES),$(if $(LUCI_LANG.$(lang)),$(eval $(call LuciTranslation,$(firstword $(LUCI_LC_ALIAS.$(lang)) $(lang)),$(lang)))))
- +# $(foreach lang,$(LUCI_LANGUAGES),$(if $(LUCI_LANG.$(lang)),$(eval $(call LuciTranslation,$(firstword $(LUCI_LC_ALIAS.$(lang)) $(lang)),$(lang)))))
- $(foreach pkg,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(pkg))))
|
