X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=9c0ca745e66a134af755e333ce63eabc9029662c;hp=2a15d5d71ada5af6b26ee6fad4324badc1294157;hb=1dbb1da4d9a4ca24d92fe0fdc78e90ce0261e450;hpb=eb6e37ebb7b9d576e9eb9f1a0d140936d11ddf11 diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 2a15d5d71..9c0ca745e 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -54,7 +54,7 @@ define Package/luci-lib-core URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team SUBMENU:=8. Libraries - DEPENDS:=+lua +libuci-lua + DEPENDS:=+lua +libuci-lua +libubus-lua TITLE:=LuCI core libraries endef @@ -173,7 +173,7 @@ ifneq ($(CONFIG_PACKAGE_luci-lib-nixio_cyassl),) endif -$(eval $(call library,fastindex,Fastindex indexing module)) +$(eval $(call library,fastindex,Fastindex indexing module,+PACKAGE_luci-lib-fastindex:liblua)) $(eval $(call library,httpclient,HTTP(S) client library,+luci-lib-web +luci-lib-nixio)) $(eval $(call library,ipkg,LuCI IPKG/OPKG call abstraction library)) $(eval $(call library,json,LuCI JSON library)) @@ -212,11 +212,10 @@ define protocol endef $(eval $(call protocol,core,Support for static/dhcp/none)) -$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA)) -$(eval $(call protocol,pptp,Support for PPtP,+pptp)) -$(eval $(call protocol,6x4,Support for 6in4/6to4,+6in4 +6to4)) -$(eval $(call protocol,3g,Support for 3G,+comgt)) -$(eval $(call protocol,relay,Support for relayd pseudo bridges,+relayd)) +$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP)) +$(eval $(call protocol,6x4,Support for 6in4/6to4/6rd,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4 +PACKAGE_luci-proto-6x4:6rd)) +$(eval $(call protocol,3g,Support for 3G,+PACKAGE_luci-proto-3g:comgt)) +$(eval $(call protocol,relay,Support for relayd pseudo bridges,+PACKAGE_luci-proto-relay:relayd)) ### Community Packages ### @@ -281,6 +280,7 @@ endef $(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-i18n-english)) $(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN)) $(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg)) +$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-mod-admin-core)) $(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json)) $(eval $(call module,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall +freifunk-common +community-profiles)) $(eval $(call module,niu,NIU - Next Generation Interface,+luci-mod-admin-core @BROKEN)) @@ -333,6 +333,9 @@ $(eval $(call application,firewall,Firmware and Portforwarding application,\ $(eval $(call application,freifunk-policyrouting,Policy routing for mesh traffic,\ +PACKAGE_luci-app-freifunk-policyrouting:freifunk-policyrouting)) +$(eval $(call application,freifunk-widgets,Widgets for the Freifunk index page,\ + +PACKAGE_luci-app-freifunk-widgets:luci-mod-freifunk)) + $(eval $(call application,meshwizard, Shellscript based wizard to setup mesh networks,\ +PACKAGE_luci-app-freifunk-meshwizard:meshwizard)) @@ -355,9 +358,10 @@ $(eval $(call application,statistics,LuCI Statistics Application,\ +PACKAGE_luci-app-statistics:collectd \ +PACKAGE_luci-app-statistics:rrdtool1 \ +PACKAGE_luci-app-statistics:collectd-mod-rrdtool \ - +PACKAGE_luci-app-statistics:collectd-mod-wireless \ + +PACKAGE_luci-app-statistics:collectd-mod-iwinfo \ +PACKAGE_luci-app-statistics:collectd-mod-interface \ - +PACKAGE_luci-app-statistics:collectd-mod-load)) + +PACKAGE_luci-app-statistics:collectd-mod-load)) \ + +PACKAGE_luci-app-statistics:collectd-mod-network)) $(eval $(call application,diag-core,LuCI Diagnostics Tools (Core))) @@ -386,7 +390,7 @@ $(eval $(call application,ddns,Dynamic DNS configuration module,\ +PACKAGE_luci-app-ddns:ddns-scripts)) $(eval $(call application,samba,Network Shares - Samba SMB/CIFS module,\ - +PACKAGE_luci-app-samba:samba3)) + +PACKAGE_luci-app-samba:samba36-server)) $(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,\ +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio)) @@ -407,7 +411,7 @@ $(eval $(call application,polipo,LuCI Support for the Polipo Proxy,\ +PACKAGE_luci-app-polipo:polipo)) $(eval $(call application,openvpn,LuCI Support for OpenVPN,\ - +PACKAGE_luci-app-openvpn:openvpn)) + +PACKAGE_luci-app-openvpn:openvpn @BROKEN)) $(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,\ luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock)) @@ -431,7 +435,31 @@ $(eval $(call application,ahcp,LuCI Support for AHCPd,\ $(eval $(call application,wshaper,LuCI Support for wshaper,\ +PACKAGE_luci-app-wshaper:wshaper)) -$(eval $(call application,lqtapifoss,Lantiq voip)) +$(eval $(call application,pbx,LuCI PBX Administration,\ + +PACKAGE_luci-app-pbx:asterisk18 \ + +PACKAGE_luci-app-pbx:asterisk18-app-authenticate \ + +PACKAGE_luci-app-pbx:asterisk18-app-disa \ + +PACKAGE_luci-app-pbx:asterisk18-app-setcallerid \ + +PACKAGE_luci-app-pbx:asterisk18-app-system \ + +PACKAGE_luci-app-pbx:asterisk18-chan-gtalk \ + +PACKAGE_luci-app-pbx:asterisk18-codec-a-mu \ + +PACKAGE_luci-app-pbx:asterisk18-codec-alaw \ + +PACKAGE_luci-app-pbx:asterisk18-func-cut \ + +PACKAGE_luci-app-pbx:asterisk18-res-clioriginate)) + +$(eval $(call application,pbx-voicemail,LuCI PBX Administration Voicemail Support,\ + luci-app-pbx +PACKAGE_luci-app-pbx-voicemail:msmtp)) + +$(eval $(call application,ltqtapi,Lantiq voip)) + +$(eval $(call application,minidlna,LuCI Support for miniDLNA,\ + +PACKAGE_luci-app-minidlna:minidlna)) + +$(eval $(call application,transmission,LuCI Support for Transmission,\ + +PACKAGE_luci-app-transmission:transmission-daemon)) + +$(eval $(call application,watchcat,LuCI Support for Watchcat,\ + +PACKAGE_luci-app-watchcat:watchcat)) ### Server Gateway Interfaces ### define sgi @@ -488,19 +516,13 @@ endef $(eval $(call theme,base,Common base for all themes)) $(eval $(call theme,openwrt,OpenWrt.org (default),,,1)) -$(eval $(call theme,fledermaus,Fledermaus Theme)) - -$(eval $(call theme,freifunk,alternative Freifunk Theme,\ - Stefan Pirwitz )) +$(eval $(call theme,bootstrap,Bootstrap Theme)) $(eval $(call theme,freifunk-bno,Freifunk Berlin Nordost Theme,\ Stefan Pirwitz )) -$(eval $(call theme,freifunk-hannover,Freifunk Hannover Theme,\ - Mikolas Bingemer )) - $(eval $(call theme,freifunk-generic,Freifunk Generic Theme,\ - Manuel Munz )) + Manuel Munz )) ### Translations ### define translation @@ -530,7 +552,7 @@ $(eval $(call translation,english,English)) $(eval $(call translation,french,French (by Florian Fainelli))) $(eval $(call translation,italian,Italian (by Matteo Croce))) $(eval $(call translation,russian,Russian (by Skryabin Dmitry))) -$(eval $(call translation,portuguese_brazilian,Portuguese (Brazilian) (by Carlos Cesario))) +$(eval $(call translation,portuguese-brazilian,Portuguese (Brazilian) (by Carlos Cesario))) $(eval $(call translation,chinese,Chinese (by Chinese Translators))) $(eval $(call translation,japanese,Japanese (by Tsukasa Hamano))) $(eval $(call translation,greek,Greek (by Vasilis Tsiligiannis))) @@ -542,6 +564,9 @@ $(eval $(call translation,malay,Malay (by Teow Wai Chet))) $(eval $(call translation,norwegian,Norwegian (by Lars Hardy))) $(eval $(call translation,hebrew,Hebrew)) $(eval $(call translation,romanian,Romanian)) +$(eval $(call translation,ukrainian,Ukrainian)) +$(eval $(call translation,hungarian,Hungarian)) +$(eval $(call translation,polish,Polish)) ### Collections ### @@ -568,7 +593,7 @@ $(eval $(call collection,,\ Standard OpenWrt set including full admin with ppp support and the \ default OpenWrt theme,\ +uhttpd +luci-mod-admin-full +luci-theme-openwrt +luci-app-firewall \ - +luci-proto-core +luci-proto-ppp +libiwinfo)) + +luci-proto-core +luci-proto-ppp +libiwinfo-lua)) $(eval $(call collection,ssl,\ Standard OpenWrt set with HTTPS support,\