X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=25a2304a8158330ff48e6b68684e8515299d29aa;hp=786a84ad268f0da1fbfd6ddb2121d7ccae82f797;hb=b36781a78294f4594bff66fdd3d539c2388acc1e;hpb=cbe2cb545ce847ddb488ecf52141f560f6cab9ed diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 786a84ad2..25a2304a8 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -12,12 +12,12 @@ PKG_RELEASE:=1 PKG_BUILD_PARALLEL:=0 ifeq ($(USELOCAL),1) - PKG_VERSION:=0.10+svn + 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:=0.10+svn$(PKG_REV) + PKG_VERSION:=trunk+svn$(PKG_REV) endif PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz @@ -39,31 +39,6 @@ ifeq ($(BOARD),brcm-2.4) endif -include $(INCLUDE_DIR)/package.mk - -ifeq ($(USELOCAL),1) - define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(TAR) c -C ../../../ . \ - --exclude=.pc --exclude=.svn --exclude=.git \ - --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ - --exclude=dist | \ - tar x -C $(PKG_BUILD_DIR)/ - endef -endif - -define Build/Configure -endef - -MAKE_FLAGS += \ - MODULES="$(LUCI_SELECTED_MODULES)" \ - LUA_TARGET="$(LUA_TARGET)" \ - LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ - CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ - LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ - NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" - - ### Templates ### define Package/luci/install/template $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R @@ -78,7 +53,7 @@ define Package/luci-lib-core TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.subsignal.org/ MAINTAINER:=LuCI Development Team - SUBMENU:=Libraries + SUBMENU:=8. Libraries DEPENDS:=+lua +libuci-lua TITLE:=LuCI core libraries endef @@ -103,6 +78,9 @@ define Package/luci-lib-core/config config PACKAGE_luci-lib-core_stripped bool "Stripped" + config PACKAGE_luci-lib-core_srcdiet + bool "Compressed Source" + config PACKAGE_luci-lib-core_source bool "Full Source" @@ -117,8 +95,8 @@ ifneq ($(CONFIG_PACKAGE_luci-lib-core_stripped),) LUA_TARGET:=strip endif -ifneq ($(CONFIG_PACKAGE_luci-lib-core_zipped),) - LUA_TARGET:=gzip +ifneq ($(CONFIG_PACKAGE_luci-lib-core_srcdiet),) + LUA_TARGET:=diet endif ifneq ($(CONFIG_PACKAGE_luci-lib-core),) @@ -136,7 +114,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 @@ -205,9 +183,40 @@ $(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,+libiwinfo)) +$(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,uvl,UVL - UCI Validation Layer,+luci-lib-sys +luci-lib-core)) + + +### Protocols ### +define protocol + define Package/luci-proto-$(1) + SECTION:=luci + CATEGORY:=LuCI + TITLE:=LuCI - Lua Configuration Interface + URL:=http://luci.subsignal.org/ + MAINTAINER:=LuCI Development Team + SUBMENU:=6. Protocols + TITLE:=$(if $(2),$(2),LuCI $(1) protocol support) + DEPENDS:=$(3) + endef + + define Package/luci-proto-$(1)/install + $(call Package/luci/install/template,$$(1),protocols/$(1)) + endef + + ifneq ($(CONFIG_PACKAGE_luci-proto-$(1)),) + LUCI_SELECTED_MODULES+=protocols/$(1) + endif + + LUCI_BUILD_PACKAGES += luci-proto-$(1) +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,+PACKAGE_luci-proto-relay:relayd)) ### Community Packages ### @@ -217,16 +226,15 @@ 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-app-ffwizard-leipzig \ - +luci-i18n-german \ - +PACKAGE_luci-mod-freifunk-community:olsrd-luci +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-dyn-gw-plain \ - +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-nameservice \ - +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \ - +PACKAGE_luci-mod-freifunk-community:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr + +luci-lib-web +luci-app-splash +luci-i18n-german \ + +PACKAGE_luci-mod-freifunk-community:olsrd +PACKAGE_luci-mod-freifunk-community:olsrd-mod-dyn-gw-plain \ + +PACKAGE_luci-mod-freifunk-community:olsrd-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-mod-nameservice \ + +PACKAGE_luci-mod-freifunk-community:olsrd-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \ + +PACKAGE_luci-mod-freifunk-community:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr \ + +luci-app-olsr-services +freifunk-gwcheck +freifunk-mapupdate endef define Package/luci-mod-freifunk-community/install @@ -248,7 +256,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 @@ -270,15 +278,11 @@ define Package/luci-mod-admin-core/extra-install touch $(1)/etc/init.d/luci_fixtime || true endef -define Package/luci-mod-freifunk/conffiles -/etc/config/freifunk -endef - -$(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-i18n-english)) -$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core)) +$(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,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)) +$(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)) @@ -290,9 +294,9 @@ 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:=+luci-mod-admin-core $(3) + DEPENDS:=$(3) endef define Package/luci-app-$(1)/install @@ -320,30 +324,38 @@ define Package/luci-app-diag-devinfo/conffiles endef -$(eval $(call application,ffwizard-leipzig,Freifunk Leipzig 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,\ +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,meshwizard, Shellscript based wizard to setup mesh networks,\ + +PACKAGE_luci-app-freifunk-meshwizard:meshwizard)) + $(eval $(call application,olsr,OLSR configuration and status module,\ - +luci-mod-admin-full +PACKAGE_luci-app-olsr:olsrd-luci +PACKAGE_luci-app-olsr:olsrd-luci-mod-txtinfo)) + +olsrd-mod-txtinfo)) + +$(eval $(call application,olsr-viz,OLSR Visualisation,\ + luci-app-olsr +olsrd-mod-txtinfo)) + +$(eval $(call application,olsr-services,Show services announced with the nameservice plugin,\ + 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,\ - +luci-mod-admin-full +PACKAGE_luci-app-statistics:collectd \ + +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)) @@ -362,8 +374,7 @@ $(eval $(call application,diag-devinfo,LuCI Diagnostics Tools (Device Info),\ $(eval $(call application,voice-core,LuCI Voice Software (Core))) $(eval $(call application,voice-diag,LuCI Voice Software (Diagnostics),\ - +luci-app-voice-core +luci-app-diag-devinfo)) - + luci-app-diag-devinfo)) $(eval $(call application,upnp,Universal Plug & Play configuration module,\ +PACKAGE_luci-app-upnp:miniupnpd)) @@ -375,28 +386,22 @@ $(eval $(call application,ddns,Dynamic DNS configuration module,\ +PACKAGE_luci-app-ddns:ddns-scripts)) $(eval $(call application,samba,Network Shares - Samba SMB/CIFS module,\ - +luci-mod-admin-full +PACKAGE_luci-app-samba:samba3)) + +PACKAGE_luci-app-samba:samba3)) $(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,\ - +luci-mod-admin-full +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio)) + +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio)) $(eval $(call application,p910nd,p910nd - Printer server module,\ - +luci-mod-admin-full +PACKAGE_luci-app-p910nd:p910nd)) + +PACKAGE_luci-app-p910nd:p910nd)) $(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,\ - +luci-mod-admin-full +PACKAGE_luci-app-ushare:ushare)) + +PACKAGE_luci-app-ushare:ushare)) $(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,\ - +luci-mod-admin-full +PACKAGE_luci-app-hd-idle:hd-idle)) + +PACKAGE_luci-app-hd-idle:hd-idle)) $(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,\ - +luci-mod-admin-full +PACKAGE_luci-app-tinyproxy:tinyproxy)) - -$(eval $(call application,initmgr,LuCI Initscript Management,\ - +luci-mod-admin-full)) - -$(eval $(call application,livestats,LuCI Realtime Statistics,\ - +luci-mod-rpc)) + +PACKAGE_luci-app-tinyproxy:tinyproxy)) $(eval $(call application,polipo,LuCI Support for the Polipo Proxy,\ +PACKAGE_luci-app-polipo:polipo)) @@ -405,10 +410,10 @@ $(eval $(call application,openvpn,LuCI Support for OpenVPN,\ +PACKAGE_luci-app-openvpn:openvpn)) $(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)) @@ -418,9 +423,30 @@ $(eval $(call application,vnstat,LuCI Support for VnStat,\ +PACKAGE_luci-app-vnstat:vnstati)) $(eval $(call application,radvd,LuCI Support for Radvd,\ - +luci-mod-admin-full +PACKAGE_luci-app-radvd:radvd)) + +PACKAGE_luci-app-radvd:radvd)) -$(eval $(call application,lqtapifoss,Lantiq voip)) +$(eval $(call application,ahcp,LuCI Support for AHCPd,\ + +PACKAGE_luci-app-ahcp:ahcpd)) + +$(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)) + +$(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)) ### Server Gateway Interfaces ### define sgi @@ -430,9 +456,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 @@ -457,7 +483,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) @@ -475,8 +501,9 @@ define theme LUCI_BUILD_PACKAGES += luci-theme-$(1) endef -$(eval $(call theme,base,Common base for all themes,,+luci-lib-web)) +$(eval $(call theme,base,Common base for all themes)) $(eval $(call theme,openwrt,OpenWrt.org (default),,,1)) +$(eval $(call theme,bootstrap,Bootstrap Theme)) $(eval $(call theme,fledermaus,Fledermaus Theme)) $(eval $(call theme,freifunk,alternative Freifunk Theme,\ @@ -489,7 +516,7 @@ $(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 @@ -499,7 +526,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 @@ -519,7 +546,8 @@ $(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))) $(eval $(call translation,catalan,Catalan (by Eduard Duran))) @@ -528,6 +556,9 @@ $(eval $(call translation,spanish,Spanish (by Guillermo Javier Nardoni))) $(eval $(call translation,vietnamese,Vietnamese (by Hong Phuc Dang))) $(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)) ### Collections ### @@ -538,7 +569,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 @@ -551,20 +582,46 @@ define collection endef $(eval $(call collection,,\ - Standard OpenWrt set including full and mini admin and the standard theme,\ + 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-app-initmgr)) + +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 +luci-app-initmgr)) + +luci +uhttpd-mod-tls +px5g)) $(eval $(call collection,light,\ Minimum package set using only admin mini and the standard theme,\ - +uhttpd +luci-mod-admin-mini +luci-theme-openwrt)) + +uhttpd +luci-mod-admin-mini +luci-theme-openwrt @BROKEN)) ### Compile ### -PKG_CONFIG_DEPENDS := $(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES)) +PKG_CONFIG_DEPENDS=$(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES)) + +include $(INCLUDE_DIR)/package.mk + +ifeq ($(USELOCAL),1) + define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(TAR) c -C ../../../ . \ + --exclude=.pc --exclude=.svn --exclude=.git \ + --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ + --exclude=dist | \ + tar x -C $(PKG_BUILD_DIR)/ + endef +endif + +define Build/Configure +endef + +MAKE_FLAGS += \ + MODULES="$(LUCI_SELECTED_MODULES)" \ + LUA_TARGET="$(LUA_TARGET)" \ + LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ + CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ + NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" + + $(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b))))