X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=5795b4da32681e81ac85fb0b9d03dc4e2c34b39b;hp=3cf4c01a06bdddcf8cebb2a9f3b34786d4baf365;hb=76a6ffc9cfd69181d3fe664c9c421462a6c4883d;hpb=0942fcc70be2ffa28158d64aa6dfacd68b747067 diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 3cf4c01a06..5795b4da32 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) @@ -61,13 +61,13 @@ endef define Package/luci/fftemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Freifunk Support (GERMAN ONLY) + SUBMENU:=LuCI Freifunk Support DEPENDS:=+luci-mod-freifunk endef define Package/luci/httpdtemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Non-Forking HTTP-Daemon (EXPERIMENTAL) + SUBMENU:=LuCIttpd DEPENDS:=+luci-httpd endef @@ -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 @@ -122,6 +127,9 @@ define Package/luci-core/config config PACKAGE_luci-core_source bool "Full Source" + config PACKAGE_luci-core_zipped + bool "Precompiled and compressed" + endchoice endef @@ -133,6 +141,10 @@ ifneq ($(CONFIG_PACKAGE_luci-core_stripped),) LUA_TARGET:=strip endif +ifneq ($(CONFIG_PACKAGE_luci-core_zipped),) + LUA_TARGET:=gzip +endif + ### Libraries ### define Package/luci-cbi @@ -177,6 +189,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 +220,51 @@ define Package/luci-json/install endef +define Package/luci-luanet + $(call Package/luci/libtemplate) + TITLE:=luanet + DEPENDS+=+libiw +endef + +define Package/luci-luanet/install + $(call Package/luci/install/template,$(1),libs/luanet) +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 +279,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 @@ -238,12 +307,12 @@ endef define Package/luci-httpd $(call Package/luci/httpdtemplate) - DEPENDS:=+luci-http +luasocket + DEPENDS:=+luci-http +libuci TITLE:=Server Core endef define Package/luci-httpd/install - $(call Package/luci/install/template,$(1),libs/httpd) + $(call Package/luci/install/template,$(1),libs/lucittpd) endef @@ -253,12 +322,13 @@ endef define Package/luci-freifunk-community $(call Package/luci/fftemplate) DEPENDS+= \ - +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ + +luci-sgi-cgi +luci-app-splash \ +luci-app-ffwizard-leipzig \ - +luci-theme-fledermaus \ +luci-i18n-german \ - +olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice \ - +kmod-tun +ip + +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:olsrd-luci-mod-watchdog +PACKAGE_luci-freifunk-community:kmod-tun \ + +PACKAGE_luci-freifunk-community:ip +luci-app-olsr TITLE:=Freifunk Community Meta-Package endef @@ -270,7 +340,7 @@ endef define Package/luci-admin-core $(call Package/luci/webtemplate) - DEPENDS+=+luci-web +luci-cbi +luci-theme-openwrt +luci-i18n-english + DEPENDS+=+luci-web +luci-cbi +luci-i18n-english TITLE:=Web UI Core Module endef @@ -281,6 +351,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 @@ -319,7 +390,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 @@ -345,9 +416,20 @@ define Package/luci-app-ffwizard-leipzig/install endef +define Package/luci-app-siitwizard + $(call Package/luci/fftemplate) + TITLE:=SIIT IPv4-over-IPv6 configuration wizard + DEPENDS:=+luci-admin-core +PACKAGE_luci-app-siitwizard:kmod-siit +endef + +define Package/luci-app-siitwizard/install + $(call Package/luci/install/template,$(1),applications/luci-siitwizard) +endef + + define Package/luci-app-firewall $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-firewall:firewall TITLE:=Firewall and Portforwarding application endef @@ -358,7 +440,7 @@ endef define Package/luci-app-olsr $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +olsrd-luci +olsrd-luci-mod-txtinfo + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-olsr:olsrd-luci +PACKAGE_luci-app-olsr:olsrd-luci-mod-txtinfo TITLE:=OLSR configuration and status module endef @@ -369,7 +451,7 @@ endef define Package/luci-app-qos $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +qos-scripts + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-qos:qos-scripts TITLE:=Quality of Service configuration module endef @@ -380,7 +462,7 @@ endef define Package/luci-app-splash $(call Package/luci/fftemplate) - DEPENDS+=+luasocket + DEPENDS+=+PACKAGE_luci-app-splash:luasocket TITLE:=Freifunk DHCP-Splash application endef @@ -395,7 +477,12 @@ endef define Package/luci-app-statistics $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +collectd +collectd-mod-rrdtool1 +rrdtool1 + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-statistics:collectd \ + +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 @@ -410,7 +497,7 @@ endef define Package/luci-app-upnp $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +miniupnpd + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-upnp:miniupnpd TITLE:=Universal Plug & Play configuration module endef @@ -421,7 +508,7 @@ endef define Package/luci-app-ntpc $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +ntpclient + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-ntpc:ntpclient TITLE:=NTP time synchronisation client configuration module endef @@ -432,7 +519,7 @@ endef define Package/luci-app-ddns $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +ddns-scripts + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-ddns:ddns-scripts TITLE:=Dynamic DNS configuration module endef @@ -443,7 +530,7 @@ endef define Package/luci-app-samba $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +samba3 + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-samba:samba3 TITLE:=Network Shares - Samba SMB/CIFS module endef @@ -454,7 +541,7 @@ endef define Package/luci-app-uvc_streamer $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +uvc-streamer + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-uvc_streamer:uvc-streamer TITLE:=Webcam Streaming - UVC-Streamer module endef @@ -465,7 +552,7 @@ endef define Package/luci-app-mmc_over_gpio $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +kmod-mmc-over-gpio + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-mmc_over_gpio:kmod-mmc-over-gpio TITLE:=mmc_over_gpio endef @@ -476,7 +563,7 @@ endef define Package/luci-app-p910nd $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +p910nd + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-p910nd:p910nd TITLE:=p910nd - Printer server module endef @@ -487,7 +574,7 @@ endef define Package/luci-app-ushare $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +ushare + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-ushare:ushare TITLE:=ushare - UPnP A/V & DLNA Media Server endef @@ -497,7 +584,7 @@ endef define Package/luci-app-hd_idle $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +hd-idle + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-hd_idle:hd-idle TITLE:=hd-idle endef @@ -507,7 +594,7 @@ endef define Package/luci-app-tinyproxy $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +tinyproxy + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-tinyproxy:tinyproxy TITLE:=Tinyproxy - HTTP(S)-Proxy endef @@ -527,8 +614,8 @@ endef define Package/luci-app-livestats $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +luci-admin-rpc - TITLE:=LuCI Realtime Statistics (Experimental) + DEPENDS+=+luci-admin-core +luci-admin-rpc + TITLE:=LuCI Realtime Statistics endef define Package/luci-app-livestats/install @@ -537,13 +624,34 @@ endef define Package/luci-app-asterisk $(call Package/luci/webtemplate) - TITLE:=LuCI Support for Asterisk PBX (Incomplete) + TITLE:=LuCI Support for Asterisk PBX + DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-asterisk:asterisk14-xip-core endef define Package/luci-app-asterisk/install $(call Package/luci/install/template,$(1),applications/luci-asterisk) endef +define Package/luci-app-polipo + $(call Package/luci/webtemplate) + TITLE:=LuCI Support for the Polipo Proxy + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-polipo:polipo +endef + +define Package/luci-app-polipo/install + $(call Package/luci/install/template,$(1),applications/luci-polipo) +endef + +define Package/luci-app-openvpn + $(call Package/luci/webtemplate) + TITLE:=LuCI Support for OpenVPN + DEPENDS+=@BROKEN +luci-admin-core +PACKAGE_luci-app-openvpn:openvpn +endef + +define Package/luci-app-openvpn/install + $(call Package/luci/install/template,$(1),applications/luci-openvpn) +endef + ### Server Gateway Interfaces ### @@ -559,7 +667,7 @@ endef define Package/luci-sgi-luci $(call Package/luci/libtemplate) DEPENDS+=+luci-httpd - TITLE:=SGI for LuCI HTTPD + TITLE:=SGI for LuCIttpd endef define Package/luci-sgi-luci/install @@ -597,7 +705,7 @@ define Package/luci-theme-fledermaus/install endef define Package/luci-theme-freifunk - $(call Package/luci/thtemplate) + $(call Package/luci/fftemplate) DEPENDS:=+luci-web MAINTAINER:=Stefan Pirwitz TITLE:=alternative Freifunk Theme @@ -608,7 +716,7 @@ define Package/luci-theme-freifunk/install endef define Package/luci-theme-freifunk-bno - $(call Package/luci/thtemplate) + $(call Package/luci/fftemplate) DEPENDS:=+luci-web MAINTAINER:=Stefan Pirwitz TITLE:=Freifunk Berlin Nordost Theme @@ -670,6 +778,16 @@ define Package/luci-i18n-french/install endef +define Package/luci-i18n-italian + $(call Package/luci/i18ntemplate) + TITLE:=Italian (by Matteo Croce) +endef + +define Package/luci-i18n-italian/install + $(call Package/luci/install/template,$(1),i18n/italian) +endef + + define Package/luci-i18n-russian $(call Package/luci/i18ntemplate) TITLE:=Russian (by Skryabin Dmitry) @@ -690,6 +808,25 @@ 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 + + +define Package/luci-i18n-greek + $(call Package/luci/i18ntemplate) + TITLE:=Greek (by Vasilis Tsiligiannis) +endef + +define Package/luci-i18n-greek/install + $(call Package/luci/install/template,$(1),i18n/greek) +endef + ### Compile ### ifneq ($(CONFIG_PACKAGE_luci-core),) PKG_SELECTED_MODULES+=libs/core @@ -703,12 +840,21 @@ 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-luanet),) + PKG_SELECTED_MODULES+=libs/luanet +endif +ifneq ($(CONFIG_PACKAGE_luci-nixio),) + PKG_SELECTED_MODULES+=libs/nixio +endif ifneq ($(CONFIG_PACKAGE_luci-uci),) PKG_SELECTED_MODULES+=libs/uci endif @@ -723,7 +869,7 @@ ifneq ($(CONFIG_PACKAGE_luci-uvl),) endif ifneq ($(CONFIG_PACKAGE_luci-httpd),) - PKG_SELECTED_MODULES+=libs/httpd + PKG_SELECTED_MODULES+=libs/lucittpd endif ifneq ($(CONFIG_PACKAGE_luci-admin-core),) @@ -749,6 +895,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-ffwizard-leipzig),) PKG_SELECTED_MODULES+=applications/luci-ffwizard-leipzig endif +ifneq ($(CONFIG_PACKAGE_luci-app-siitwizard),) + PKG_SELECTED_MODULES+=applications/luci-siitwizard +endif ifneq ($(CONFIG_PACKAGE_luci-app-firewall),) PKG_SELECTED_MODULES+=applications/luci-fw endif @@ -803,6 +952,12 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-asterisk),) PKG_SELECTED_MODULES+=applications/luci-asterisk endif +ifneq ($(CONFIG_PACKAGE_luci-app-polipo),) + PKG_SELECTED_MODULES+=applications/luci-polipo +endif +ifneq ($(CONFIG_PACKAGE_luci-app-openvpn),) + PKG_SELECTED_MODULES+=applications/luci-openvpn +endif ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),) @@ -843,29 +998,41 @@ endif ifneq ($(CONFIG_PACKAGE_luci-i18n-french),) PKG_SELECTED_MODULES+=i18n/french endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-italian),) + PKG_SELECTED_MODULES+=i18n/italian +endif ifneq ($(CONFIG_PACKAGE_luci-i18n-russian),) PKG_SELECTED_MODULES+=i18n/russian 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 +ifneq ($(CONFIG_PACKAGE_luci-i18n-greek),) + PKG_SELECTED_MODULES+=i18n/greek +endif MAKE_FLAGS += \ MODULES="$(PKG_SELECTED_MODULES)" \ LUA_TARGET="$(LUA_TARGET)" \ - LUA_SHLIBS="-llua -lm" \ + 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-luanet)) +$(eval $(call BuildPackage,luci-nixio)) $(eval $(call BuildPackage,luci-uci)) $(eval $(call BuildPackage,luci-sys)) $(eval $(call BuildPackage,luci-web)) @@ -882,6 +1049,7 @@ $(eval $(call BuildPackage,luci-mod-freifunk)) $(eval $(call BuildPackage,luci-freifunk-community)) $(eval $(call BuildPackage,luci-app-ffwizard-leipzig)) +$(eval $(call BuildPackage,luci-app-siitwizard)) $(eval $(call BuildPackage,luci-app-firewall)) $(eval $(call BuildPackage,luci-app-olsr)) $(eval $(call BuildPackage,luci-app-qos)) @@ -900,6 +1068,8 @@ $(eval $(call BuildPackage,luci-app-tinyproxy)) $(eval $(call BuildPackage,luci-app-initmgr)) $(eval $(call BuildPackage,luci-app-livestats)) $(eval $(call BuildPackage,luci-app-asterisk)) +$(eval $(call BuildPackage,luci-app-polipo)) +$(eval $(call BuildPackage,luci-app-openvpn)) $(eval $(call BuildPackage,luci-sgi-cgi)) $(eval $(call BuildPackage,luci-sgi-luci)) @@ -915,5 +1085,8 @@ $(eval $(call BuildPackage,luci-theme-openwrtlight)) $(eval $(call BuildPackage,luci-i18n-german)) $(eval $(call BuildPackage,luci-i18n-english)) $(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)) +$(eval $(call BuildPackage,luci-i18n-greek))