X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=45c3ecb5970849477d9b88360466be1985fd6e6e;hb=5fbbf066119ab9dcec7c05e2aae62f5df7e88d89;hp=a6be83bf6f3edb3092ad5187eb97f18a3c1036fc;hpb=9694c56558e9735b34d2b46ad3ee6483f91a8a7e;p=project%2Fluci.git diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index a6be83bf6..45c3ecb59 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -14,7 +14,7 @@ ifeq ($(USELOCAL),1) else PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH) ifeq ($(DUMP),) - PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p') + PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Revision: //p') PKG_VERSION:=0.9+svn$(PKG_REV) endif PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) @@ -106,6 +106,11 @@ endef define Package/luci-core/install $(call Package/luci/install/template,$(1),libs/core) + $(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \ + "OpenWrt Firmware" \ + "$(OPENWRTVERSION)" \ + "$(PKG_BRANCH)" \ + "$(PKG_VERSION)" endef define Package/luci-core/config @@ -177,6 +182,17 @@ define Package/luci-http/install endef +define Package/luci-httpclient + $(call Package/luci/libtemplate) + TITLE:=HTTP(S) client library + DEPENDS+=+luci-http +luci-nixio +endef + +define Package/luci-httpclient/install + $(call Package/luci/install/template,$(1),libs/httpclient) +endef + + define Package/luci-ipkg $(call Package/luci/libtemplate) TITLE:=LuCI IPKG/OPKG call abstraction library @@ -197,6 +213,40 @@ define Package/luci-json/install endef + +NIXIO_TLS:=axtls + +define Package/luci-nixio + $(call Package/luci/libtemplate) + TITLE:=NIXIO Socket Library + DEPENDS:= +endef + +define Package/luci-nixio/install + $(call Package/luci/install/template,$(1),libs/nixio) +endef + +define Package/luci-nixio/config + choice + prompt "TLS Provider" + default PACKAGE_luci-nixio_axtls + + config PACKAGE_luci-nixio_axtls + bool "Builtin (axTLS)" + select PACKAGE_dropbear + select PACKAGE_dropbearconvert + + config PACKAGE_luci-nixio_openssl + bool "OpenSSL" + select PACKAGE_libopenssl + endchoice +endef + +ifneq ($(CONFIG_PACKAGE_luci-nixio_openssl),) + NIXIO_TLS:=openssl +endif + + define Package/luci-sys $(call Package/luci/libtemplate) TITLE:=LuCI Linux/POSIX system library @@ -211,6 +261,7 @@ define Package/luci-web $(call Package/luci/libtemplate) DEPENDS+=+luci-http +luci-sys +luci-uci +luci-sgi-cgi TITLE:=MVC Webframework + $(call Config,luci.main.lang,string,en,Default Language) endef define Package/luci-web/conffiles @@ -255,12 +306,11 @@ define Package/luci-freifunk-community DEPENDS+= \ +luci-sgi-cgi +luci-app-splash \ +luci-app-ffwizard-leipzig \ - +luci-theme-fledermaus \ +luci-i18n-german \ - +PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw \ + +PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw-plain \ +PACKAGE_luci-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-freifunk-community:olsrd-luci-mod-nameservice \ - +PACKAGE_luci-freifunk-community:kmod-tun +PACKAGE_luci-freifunk-community:ip \ - +luci-app-olsr + +PACKAGE_luci-freifunk-community:olsrd-luci-mod-watchdog +PACKAGE_luci-freifunk-community:kmod-tun \ + +PACKAGE_luci-freifunk-community:ip +luci-app-olsr TITLE:=Freifunk Community Meta-Package endef @@ -283,6 +333,7 @@ endef define Package/luci-admin-core/install $(call Package/luci/install/template,$(1),modules/admin-core) + touch $(1)/etc/init.d/luci_fixtime || true endef @@ -299,7 +350,7 @@ endef define Package/luci-admin-full $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +luci-ipkg +PACKAGE_luci-admin-full:iptables +PACKAGE_luci-admin-full:firewall +luci-app-firewall + DEPENDS+=+luci-admin-core +luci-ipkg TITLE:=LuCI Administration - full-featured for full control endef @@ -321,7 +372,7 @@ endef define Package/luci-mod-freifunk $(call Package/luci/fftemplate) - DEPENDS:=+luci-admin-full + DEPENDS:=+luci-admin-full +luci-json TITLE:=LuCI Freifunk module endef @@ -409,7 +460,11 @@ endef define Package/luci-app-statistics $(call Package/luci/webtemplate) DEPENDS+=+luci-admin-full +PACKAGE_luci-app-statistics:collectd \ - +PACKAGE_luci-app-statistics:collectd-mod-rrdtool1 +PACKAGE_luci-app-statistics:rrdtool1 + +PACKAGE_luci-app-statistics:rrdtool1 \ + +PACKAGE_luci-app-statistics:collectd-mod-rrdtool1 \ + +PACKAGE_luci-app-statistics:collectd-mod-wireless \ + +PACKAGE_luci-app-statistics:collectd-mod-interface \ + +PACKAGE_luci-app-statistics:collectd-mod-load TITLE:=LuCI Statistics Application endef @@ -552,7 +607,7 @@ endef define Package/luci-app-asterisk $(call Package/luci/webtemplate) TITLE:=LuCI Support for Asterisk PBX - DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-asterisk:asterisk14-xip + DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-asterisk:asterisk14-xip-core endef define Package/luci-app-asterisk/install @@ -735,6 +790,15 @@ define Package/luci-i18n-portuguese_brazilian/install endef +define Package/luci-i18n-japanese + $(call Package/luci/i18ntemplate) + TITLE:=Japanese (by Tsukasa Hamano) +endef + +define Package/luci-i18n-japanese/install + $(call Package/luci/install/template,$(1),i18n/japanese) +endef + ### Compile ### ifneq ($(CONFIG_PACKAGE_luci-core),) PKG_SELECTED_MODULES+=libs/core @@ -748,12 +812,18 @@ endif ifneq ($(CONFIG_PACKAGE_luci-http),) PKG_SELECTED_MODULES+=libs/http endif +ifneq ($(CONFIG_PACKAGE_luci-httpclient),) + PKG_SELECTED_MODULES+=libs/httpclient +endif ifneq ($(CONFIG_PACKAGE_luci-ipkg),) PKG_SELECTED_MODULES+=libs/ipkg endif ifneq ($(CONFIG_PACKAGE_luci-json),) PKG_SELECTED_MODULES+=libs/json endif +ifneq ($(CONFIG_PACKAGE_luci-nixio),) + PKG_SELECTED_MODULES+=libs/nixio +endif ifneq ($(CONFIG_PACKAGE_luci-uci),) PKG_SELECTED_MODULES+=libs/uci endif @@ -906,6 +976,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-i18n-portuguese_brazilian),) PKG_SELECTED_MODULES+=i18n/portuguese_brazilian endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-japanese),) + PKG_SELECTED_MODULES+=i18n/japanese +endif MAKE_FLAGS += \ @@ -914,15 +987,17 @@ MAKE_FLAGS += \ LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ - OS="Linux" + NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" $(eval $(call BuildPackage,luci-core)) $(eval $(call BuildPackage,luci-cbi)) $(eval $(call BuildPackage,luci-fastindex)) $(eval $(call BuildPackage,luci-http)) +$(eval $(call BuildPackage,luci-httpclient)) $(eval $(call BuildPackage,luci-ipkg)) $(eval $(call BuildPackage,luci-json)) +$(eval $(call BuildPackage,luci-nixio)) $(eval $(call BuildPackage,luci-uci)) $(eval $(call BuildPackage,luci-sys)) $(eval $(call BuildPackage,luci-web)) @@ -978,3 +1053,4 @@ $(eval $(call BuildPackage,luci-i18n-french)) $(eval $(call BuildPackage,luci-i18n-italian)) $(eval $(call BuildPackage,luci-i18n-russian)) $(eval $(call BuildPackage,luci-i18n-portuguese_brazilian)) +$(eval $(call BuildPackage,luci-i18n-japanese))