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
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
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- SUBMENU:=Libraries
+ SUBMENU:=8. Libraries
DEPENDS:=+lua +libuci-lua
TITLE:=LuCI core libraries
endef
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"
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),)
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- SUBMENU:=Libraries
+ SUBMENU:=8. Libraries
TITLE:=$(if $(2),$(2),LuCI $(1) library)
$(if $(3),DEPENDS:=+luci-lib-core $(3))
endef
$(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 <luci@lists.subsignal.org>
+ 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 ###
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- 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
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- SUBMENU:=Modules
+ SUBMENU:=2. Modules
TITLE:=$(if $(2),$(2),LuCI $(1) module)
$(if $(3),DEPENDS+=$(3))
endef
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))
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- 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
define Package/luci-app-splash/conffiles
/etc/config/luci_splash
+/usr/lib/luci-splash/splashtext.html
endef
define Package/luci-app-statistics/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))
$(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))
+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))
-
-$(eval $(call application,asterisk,LuCI Support for Asterisk PBX,\
- @BROKEN +PACKAGE_luci-app-asterisk:asterisk14-xip-core))
+ +PACKAGE_luci-app-tinyproxy:tinyproxy))
$(eval $(call application,polipo,LuCI Support for the Polipo Proxy,\
+PACKAGE_luci-app-polipo:polipo))
+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))
+PACKAGE_luci-app-vnstat:vnstat \
+PACKAGE_luci-app-vnstat:vnstati))
+$(eval $(call application,radvd,LuCI Support for Radvd,\
+ +PACKAGE_luci-app-radvd:radvd))
+
+$(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,lqtapifoss,Lantiq voip))
### Server Gateway Interfaces ###
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- 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
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 <luci@lists.subsignal.org>)
DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4)
- $(if $(5),DEFAULT:=y if PACKAGE_luci-lib-core)
+ $(if $(5),DEFAULT:=PACKAGE_luci-lib-core)
endef
define Package/luci-theme-$(1)/install
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,fledermaus,Fledermaus Theme))
$(eval $(call theme,freifunk-hannover,Freifunk Hannover Theme,\
Mikolas Bingemer <mickey-at-freifunk-hannover-dot-de>))
+$(eval $(call theme,freifunk-generic,Freifunk Generic Theme,\
+ Manuel Munz <freifunk-at-somakoma-dot-de>))
### Translations ###
define translation
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- SUBMENU:=Translations
+ SUBMENU:=5. Translations
TITLE:=$(if $(2),$(2),$(1))
endef
$(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)))
$(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 ###
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- SUBMENU:=Collections
+ SUBMENU:=1. Collections
TITLE:=$(if $(2),$(2),LuCI $(if $(1),$(1),general) collection)
$(if $(3),DEPENDS:=$(3))
endef
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 athe standard theme,\
- +uhttpd +luci-mod-admin-mini +luci-theme-openwrt-light))
+ Minimum package set using only admin mini and the standard theme,\
+ +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))))