X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=1b6945eb5731265ee1345930b360aa468759ee90;hp=78e0912532415d9879034fcac862ff191cef7070;hb=7add578817b9406700022b60aa75012037bc289a;hpb=eeb63417a120c3affed24a42aae650c3a7d69b7a diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 78e091253..1b6945eb5 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 @@ -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,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4)) +$(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 ### @@ -324,8 +323,6 @@ define Package/luci-app-diag-devinfo/conffiles endef -$(eval $(call application,ffwizard,Freifunk configuration wizard)) - $(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,\ +PACKAGE_luci-app-siitwizard:kmod-siit)) @@ -357,9 +354,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))) @@ -388,7 +386,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)) @@ -433,7 +431,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 @@ -490,19 +512,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 @@ -532,7 +548,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))) @@ -544,6 +560,8 @@ $(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)) ### Collections ### @@ -570,7 +588,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,\