X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=6be79a96b7c49a86868506f53450c26907d03bd5;hp=7b8c8b5d9534683fc048f007c78f28f35ec18e6e;hb=49fc87429ff313ef37a9473147ddd8cf97d74d08;hpb=20dddbba08d719f89f015a8f679fc3bb4b969b54 diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 7b8c8b5d9..6be79a96b 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -1,32 +1,16 @@ include $(TOPDIR)/rules.mk -PKG_BRANCH:=trunk - -ifeq ($(DUMP),) - USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1) -endif +LUCI_TOPDIR=../../.. PKG_NAME:=luci PKG_RELEASE:=1 PKG_BUILD_PARALLEL:=0 -ifeq ($(USELOCAL),1) - PKG_VERSION:=trunk+svn -else - PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH) - ifeq ($(DUMP),) - PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne's/^Revision: //p') - PKG_VERSION:=trunk+svn$(PKG_REV) - endif - PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) - PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz - PKG_SOURCE_PROTO:=svn - PKG_SOURCE_VERSION:=$(PKG_REV) -endif +PKG_VERSION:=$(shell $(LUCI_TOPDIR)/build/mkrevision.sh 2>/dev/null || echo unknown) PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host) -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install LUA_TARGET:=source @@ -53,8 +37,8 @@ define Package/luci-lib-core TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Libraries - DEPENDS:=+lua +libuci-lua + SUBMENU:=8. Libraries + DEPENDS:=+lua +libuci-lua +libubus-lua TITLE:=LuCI core libraries endef @@ -63,7 +47,7 @@ define Package/luci-lib-core/install $(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \ "OpenWrt Firmware" \ "$(OPENWRTVERSION)" \ - "$(PKG_BRANCH)" \ + "trunk" \ "$(PKG_VERSION)" endef @@ -114,7 +98,7 @@ define library TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Libraries + SUBMENU:=8. Libraries TITLE:=$(if $(2),$(2),LuCI $(1) library) $(if $(3),DEPENDS:=+luci-lib-core $(3)) endef @@ -173,18 +157,17 @@ 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)) -$(eval $(call library,lmo,LuCI LMO I18N library)) $(eval $(call library,lucid,LuCId Full-Stack Webserver,+luci-lib-nixio +luci-lib-web +luci-lib-px5g)) $(eval $(call library,lucid-http,LuCId HTTP Backend,+luci-lib-lucid)) $(eval $(call library,lucid-rpc,LuCId RPC Backend,+luci-lib-lucid)) $(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl)) $(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio)) $(eval $(call library,sys,LuCI Linux/POSIX system library)) -$(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi +luci-lib-lmo)) +$(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi)) ### Protocols ### @@ -195,9 +178,9 @@ define protocol TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Protocols + SUBMENU:=6. Protocols TITLE:=$(if $(2),$(2),LuCI $(1) protocol support) - $(if $(3),DEPENDS:=+luci-proto-core $(3)) + DEPENDS:=$(3) endef define Package/luci-proto-$(1)/install @@ -212,9 +195,8 @@ define protocol endef $(eval $(call protocol,core,Support for static/dhcp/none)) -$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA,+PACKAGE_luci-proto-ppp:ppp-mod-pppoe +PACKAGE_luci-proto-ppp:ppp-mod-pppoa)) -$(eval $(call protocol,pptp,Support for PPtP,+PACKAGE_luci-proto-pptp:pptp)) -$(eval $(call protocol,6x4,Support for 6in4/6to4,+PACKAGE_luci-proto-6x4:6in4 +PACKAGE_luci-proto-6x4:6to4)) +$(eval $(call protocol,ppp,Support for PPP/PPPoE/PPPoA/PPtP)) +$(eval $(call protocol,ipv6,Support for DHCPv6/6in4/6to4/6rd/DS-Lite)) $(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)) @@ -226,7 +208,7 @@ define Package/luci-mod-freifunk-community TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Freifunk + SUBMENU:=9. Freifunk TITLE:=Freifunk Community Meta-Package DEPENDS+= \ +luci-lib-web +luci-app-splash +luci-i18n-german \ @@ -256,7 +238,7 @@ define module TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Modules + SUBMENU:=2. Modules TITLE:=$(if $(2),$(2),LuCI $(1) module) $(if $(3),DEPENDS+=$(3)) endef @@ -278,11 +260,12 @@ define Package/luci-mod-admin-core/extra-install touch $(1)/etc/init.d/luci_fixtime || true endef -$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-proto-core +luci-proto-ppp +luci-i18n-english)) +$(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,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall +freifunk-common)) $(eval $(call module,niu,NIU - Next Generation Interface,+luci-mod-admin-core @BROKEN)) @@ -294,7 +277,7 @@ define application TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Applications + SUBMENU:=3. Applications TITLE:=$(if $(2),$(2),LuCI $(1) application) DEPENDS:=$(3) endef @@ -324,44 +307,46 @@ 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)) -$(eval $(call application,firewall,Firmware and Portforwarding application,\ +$(eval $(call application,firewall,Firewall and Portforwarding application,\ +PACKAGE_luci-app-firewall:firewall)) $(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)) $(eval $(call application,olsr,OLSR configuration and status module,\ - +PACKAGE_luci-app-olsr:olsrd +PACKAGE_luci-app-olsr:olsrd-mod-txtinfo)) + +olsrd +olsrd-mod-jsoninfo)) $(eval $(call application,olsr-viz,OLSR Visualisation,\ - luci-app-olsr +PACKAGE_luci-app-olsr-viz:olsrd-mod-txtinfo)) + luci-app-olsr +olsrd-mod-txtinfo)) + +$(eval $(call application,freifunk-diagnostics,Tools for network diagnosis like traceroute and ping)) $(eval $(call application,olsr-services,Show services announced with the nameservice plugin,\ - luci-app-olsr +PACKAGE_luci-app-olsr-services:olsrd-mod-nameservice)) + luci-app-olsr +olsrd-mod-nameservice)) $(eval $(call application,qos,Quality of Service configuration module,\ +PACKAGE_luci-app-qos:qos-scripts)) $(eval $(call application,splash,Freifunk DHCP-Splash application,\ - +luci-lib-nixio +PACKAGE_luci-app-splash:tc \ - +PACKAGE_luci-app-splash:kmod-sched +PACKAGE_luci-app-splash:iptables-mod-nat-extra \ - +PACKAGE_luci-app-splash:iptables-mod-ipopt)) + +luci-lib-nixio +tc +kmod-sched +iptables-mod-nat-extra +iptables-mod-ipopt)) $(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))) @@ -380,6 +365,8 @@ $(eval $(call application,voice-core,LuCI Voice Software (Core))) $(eval $(call application,voice-diag,LuCI Voice Software (Diagnostics),\ luci-app-diag-devinfo)) +$(eval $(call application,commands,LuCI Shell Command Module)) + $(eval $(call application,upnp,Universal Plug & Play configuration module,\ +PACKAGE_luci-app-upnp:miniupnpd)) @@ -390,7 +377,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)) @@ -411,13 +398,13 @@ $(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)) + luci-app-firewall +PACKAGE_luci-app-p2pblock:freifunk-p2pblock)) $(eval $(call application,multiwan,LuCI Support for the OpenWrt MultiWAN agent,\ - +luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan)) + luci-app-firewall +PACKAGE_luci-app-multiwan:multiwan)) $(eval $(call application,wol,LuCI Support for Wake-on-LAN,\ +PACKAGE_luci-app-wol:etherwake)) @@ -432,7 +419,40 @@ $(eval $(call application,radvd,LuCI Support for Radvd,\ $(eval $(call application,ahcp,LuCI Support for AHCPd,\ +PACKAGE_luci-app-ahcp:ahcpd)) -$(eval $(call application,lqtapifoss,Lantiq voip)) +$(eval $(call application,wshaper,LuCI Support for wshaper,\ + +PACKAGE_luci-app-wshaper:wshaper)) + +$(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 \ + +PACKAGE_luci-app-pbx:asterisk18-func-channel \ + +PACKAGE_luci-app-pbx:asterisk18-chan-local \ + +PACKAGE_luci-app-pbx:asterisk18-app-record \ + +PACKAGE_luci-app-pbx:asterisk18-app-senddtmf \ + +PACKAGE_luci-app-pbx:asterisk18-res-crypto)) + +$(eval $(call application,pbx-voicemail,LuCI PBX Administration Voicemail Support,\ + luci-app-pbx +PACKAGE_luci-app-pbx-voicemail:msmtp \ + +PACKAGE_luci-app-pbx-voicemail:coreutils-base64)) + +$(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 @@ -442,9 +462,9 @@ define sgi TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Server Interfaces + SUBMENU:=7. Server Interfaces TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface) - $(if $(3),DEPENDS:=$(3)) + DEPENDS:=$(3) endef define Package/luci-sgi-$(1)/install @@ -469,7 +489,7 @@ define theme CATEGORY:=LuCI TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ - SUBMENU:=Themes + SUBMENU:=4. Themes TITLE:=$(if $(2),$(2),LuCI $(1) theme) MAINTAINER:=$(if $(3),$(3),LuCI Development Team ) DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4) @@ -487,21 +507,15 @@ define theme LUCI_BUILD_PACKAGES += luci-theme-$(1) endef -$(eval $(call theme,base,Common base for all themes,,+luci-lib-web)) -$(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,base,Common base for all themes)) +$(eval $(call theme,openwrt,OpenWrt.org)) +$(eval $(call theme,bootstrap,Bootstrap Theme (default),,,1)) $(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 @@ -511,7 +525,7 @@ define translation TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Translations + SUBMENU:=5. Translations TITLE:=$(if $(2),$(2),$(1)) endef @@ -531,7 +545,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))) @@ -543,6 +557,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 ### @@ -553,7 +570,7 @@ define collection TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Collections + SUBMENU:=1. Collections TITLE:=$(if $(2),$(2),LuCI $(if $(1),$(1),general) collection) $(if $(3),DEPENDS:=$(3)) endef @@ -566,14 +583,14 @@ define collection endef $(eval $(call collection,,\ - Standard OpenWrt set including full and mini admin and the standard theme,\ - +uhttpd +luci-mod-admin-full +luci-theme-openwrt +luci-app-firewall \ - +libiwinfo)) + Standard OpenWrt set including full admin with ppp support and the \ + default OpenWrt theme,\ + +uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-bootstrap \ + +luci-app-firewall +luci-proto-core +luci-proto-ppp +libiwinfo-lua)) $(eval $(call collection,ssl,\ Standard OpenWrt set with HTTPS support,\ - +uhttpd +uhttpd-mod-tls +px5g +luci-mod-admin-full +luci-theme-openwrt \ - +luci-app-firewall +libiwinfo)) + +luci +libustream-cyassl +px5g)) $(eval $(call collection,light,\ Minimum package set using only admin mini and the standard theme,\ @@ -585,16 +602,20 @@ PKG_CONFIG_DEPENDS=$(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES)) include $(INCLUDE_DIR)/package.mk -ifeq ($(USELOCAL),1) - define Build/Prepare +define Build/Prepare + @if [ ! -x $(LUCI_TOPDIR)/build/mkrevision.sh ]; then \ + echo "*** Repository layout changed!" >&2; \ + echo "*** Please change the LuCI url in feeds.conf to http://svn.luci.subsignal.org/luci/trunk and reinstall the feed with" >&2; \ + echo "*** ./scripts/feeds update luci; ./scripts/feeds install -a -p luci" >&2; \ + exit 1; \ + fi mkdir -p $(PKG_BUILD_DIR) - $(TAR) c -C ../../../ . \ + $(TAR) c -C $(LUCI_TOPDIR) . \ --exclude=.pc --exclude=.svn --exclude=.git \ --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ --exclude=dist | \ tar x -C $(PKG_BUILD_DIR)/ - endef -endif +endef define Build/Configure endef