PKG_RELEASE:=1
ifeq ($(USELOCAL),1)
- PKG_VERSION:=0.9+svn
+ PKG_VERSION:=0.10+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.9+svn$(PKG_REV)
+ PKG_VERSION:=0.10+svn$(PKG_REV)
endif
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
PKG_SOURCE_VERSION:=$(PKG_REV)
endif
+PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.freifunk-halle.net/
MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
- SUBMENU:=Libraries
+ SUBMENU:=Internal Libraries
DEPENDS:=+luci-core
endef
+define Package/luci/webservertemplate
+ $(call Package/luci/libtemplate)
+ SUBMENU:=Webserver
+endef
+
define Package/luci/fftemplate
$(call Package/luci/libtemplate)
SUBMENU:=Freifunk
DEPENDS:=+luci-web
endef
+define Package/luci/maintemplate
+ $(call Package/luci/libtemplate)
+ SUBMENU:=
+endef
+
define Package/luci/webtemplate
$(call Package/luci/libtemplate)
SUBMENU:=Components
endef
+define Package/luci/collectiontemplate
+ $(call Package/luci/libtemplate)
+ SUBMENU:=Collections
+endef
+
define Package/luci/install/template
$(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
### Libraries ###
-define Package/luci-cbi
- $(call Package/luci/libtemplate)
- DEPENDS+=+luci-web +luci-uvl +luci-uci
- TITLE:=Configuration Binding Interface
-endef
-
-define Package/luci-cbi/install
- $(call Package/luci/install/template,$(1),libs/cbi)
-endef
-
-
-define Package/luci-uci
- $(call Package/luci/libtemplate)
- DEPENDS+=+libuci-lua
- TITLE:=High-Level UCI API
-endef
-
-define Package/luci-uci/install
- $(call Package/luci/install/template,$(1),libs/uci)
-endef
-
-
define Package/luci-fastindex
$(call Package/luci/libtemplate)
TITLE:=Fastindex indexing module
endef
-define Package/luci-http
- $(call Package/luci/libtemplate)
- TITLE:=HTTP Protocol implementation
-endef
-
-define Package/luci-http/install
- $(call Package/luci/install/template,$(1),libs/http)
-endef
-
-
define Package/luci-httpclient
$(call Package/luci/libtemplate)
TITLE:=HTTP(S) client library
- DEPENDS+=+luci-http +luci-nixio
+ DEPENDS+=+luci-web +luci-nixio
endef
define Package/luci-httpclient/install
endef
-define Package/luci-iwinfo
- $(call Package/luci/libtemplate)
- TITLE:=Wireless abstration library
-endef
-
-define Package/luci-iwinfo/install
- $(call Package/luci/install/template,$(1),libs/iwinfo)
-endef
-
-
define Package/luci-lucid
- $(call Package/luci/libtemplate)
- TITLE:=LuCId Superserver
- DEPENDS+=+luci-nixio +luci-http +luci-px5g
+ $(call Package/luci/webservertemplate)
+ TITLE:=LuCId Full-Stack Webserver
+ DEPENDS+=+luci-nixio +luci-web +luci-px5g
endef
define Package/luci-lucid/install
-NIXIO_TLS:=axtls
+NIXIO_TLS:=
define Package/luci-nixio
$(call Package/luci/libtemplate)
TITLE:=NIXIO POSIX Library
- DEPENDS:=+PACKAGE_luci-nixio_openssl:libopenssl +PACKAGE_luci-nixio_cyassl:libcyassl-luci
+ DEPENDS:=+PACKAGE_luci-nixio_openssl:libopenssl +PACKAGE_luci-nixio_cyassl:libcyassl
endef
define Package/luci-nixio/install
define Package/luci-nixio/config
choice
prompt "TLS Provider"
- default PACKAGE_luci-nixio_axtls
+ default PACKAGE_luci-nixio_notls
+
+ config PACKAGE_luci-nixio_notls
+ bool "Disabled"
config PACKAGE_luci-nixio_axtls
bool "Builtin (axTLS)"
config PACKAGE_luci-nixio_cyassl
bool "CyaSSL"
- select PACKAGE_libcyassl-luci
+ select PACKAGE_libcyassl
config PACKAGE_luci-nixio_openssl
bool "OpenSSL"
endchoice
endef
+ifneq ($(CONFIG_PACKAGE_luci-nixio_axtls),)
+ NIXIO_TLS:=axtls
+endif
+
ifneq ($(CONFIG_PACKAGE_luci-nixio_openssl),)
NIXIO_TLS:=openssl
endif
define Package/luci-px5g
- $(call Package/luci/libtemplate)
- TITLE:=PX5G RSA Keymaster
+ $(call Package/luci/webservertemplate)
+ TITLE:=RSA/X.509 Key Generator (required for LuCId SSL support)
DEPENDS:=+luci-nixio
endef
define Package/luci-sys
$(call Package/luci/libtemplate)
TITLE:=LuCI Linux/POSIX system library
- DEPENDS:=+luci-iwinfo
+ DEPENDS:=+libiwinfo
endef
define Package/luci-sys/install
define Package/luci-web
$(call Package/luci/libtemplate)
- DEPENDS+=+luci-http +luci-sys +luci-uci +luci-lucid +luci-sgi-cgi +luci-lmo
+ DEPENDS+=+luci-sys +luci-nixio +luci-core \
+ +luci-sgi-cgi +luci-lmo
TITLE:=MVC Webframework
- $(call Config,luci.main.lang,string,en,Default Language)
+ $(call Config,luci.main.lang,string,auto,Default Language)
endef
define Package/luci-web/conffiles
define Package/luci-uvl
$(call Package/luci/libtemplate)
- DEPENDS+=+luci-sys +luci-uci +luci-core
+ DEPENDS+=+luci-sys +luci-core
TITLE:=UVL - UCI Validation Layer
endef
define Package/luci-freifunk-community
$(call Package/luci/fftemplate)
DEPENDS+= \
- +luci-lucid +luci-sgi-cgi +luci-app-splash \
+ +luci-web +luci-app-splash \
+luci-app-ffwizard-leipzig \
+luci-i18n-german \
+PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw-plain \
define Package/luci-admin-core
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-web +luci-cbi +luci-i18n-english
+ DEPENDS+=+luci-web +luci-i18n-english
TITLE:=Web UI Core Module
endef
-define Package/luci-admin-core/conffiles
-/etc/config/luci_hosts
-/etc/config/luci_ethers
-endef
-
define Package/luci-admin-core/install
$(call Package/luci/install/template,$(1),modules/admin-core)
touch $(1)/etc/init.d/luci_fixtime || true
endef
+define Package/luci-niu
+ $(call Package/luci/maintemplate)
+ DEPENDS+=+luci-admin-core @BROKEN
+ TITLE:=NIU - Next Generation Interface
+endef
+
+define Package/luci-niu/install
+ $(call Package/luci/install/template,$(1),modules/niu)
+endef
+
define Package/luci-admin-mini
$(call Package/luci/webtemplate)
DEPENDS+=+luci-admin-core
$(call Package/luci/webtemplate)
DEPENDS+=+luci-admin-full +PACKAGE_luci-app-statistics:collectd \
+PACKAGE_luci-app-statistics:rrdtool1 \
- +PACKAGE_luci-app-statistics:collectd-mod-rrdtool1 \
+ +PACKAGE_luci-app-statistics:collectd-mod-rrdtool \
+PACKAGE_luci-app-statistics:collectd-mod-wireless \
+PACKAGE_luci-app-statistics:collectd-mod-interface \
+PACKAGE_luci-app-statistics:collectd-mod-load
define Package/luci-app-diag-devinfo
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-app-diag-core +smap +netdiscover +mac-to-devinfo +httping +smap-to-devinfo +netdiscover-to-devinfo
+ DEPENDS+=+PACKAGE_luci-app-diag-devinfo:luci-app-diag-core \
+ +PACKAGE_luci-app-diag-devinfo:smap \
+ +PACKAGE_luci-app-diag-devinfo:netdiscover \
+ +PACKAGE_luci-app-diag-devinfo:mac-to-devinfo \
+ +PACKAGE_luci-app-diag-devinfo:httping \
+ +PACKAGE_luci-app-diag-devinfo:smap-to-devinfo \
+ +PACKAGE_luci-app-diag-devinfo:netdiscover-to-devinfo
TITLE:=LuCI Diagnostics Tools (Device Info)
endef
define Package/luci-app-voice-diag
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-app-voice-core +luci-app-diag-devinfo
+ DEPENDS+=+PACKAGE_luci-app-voice-diag:luci-app-voice-core \
+ +PACKAGE_luci-app-voice-diag:luci-app-diag-devinfo
TITLE:=LuCI Voice Software (Diagnostics)
endef
endef
-define Package/luci-app-uvc_streamer
+define Package/luci-app-mmc-over-gpio
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-admin-full +PACKAGE_luci-app-uvc_streamer:uvc-streamer
- TITLE:=Webcam Streaming - UVC-Streamer module
-endef
-
-define Package/luci-app-uvc_streamer/install
- $(call Package/luci/install/template,$(1),applications/luci-uvc_streamer)
-endef
-
-
-define Package/luci-app-mmc_over_gpio
- $(call Package/luci/webtemplate)
- DEPENDS+=+luci-admin-full +PACKAGE_luci-app-mmc_over_gpio:kmod-mmc-over-gpio
+ DEPENDS+=+luci-admin-full +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio
TITLE:=mmc_over_gpio
endef
-define Package/luci-app-mmc_over_gpio/install
- $(call Package/luci/install/template,$(1),applications/luci-mmc_over_gpio)
+define Package/luci-app-mmc-over-gpio/install
+ $(call Package/luci/install/template,$(1),applications/luci-mmc-over-gpio)
endef
$(call Package/luci/install/template,$(1),applications/luci-ushare)
endef
-define Package/luci-app-hd_idle
+define Package/luci-app-hd-idle
$(call Package/luci/webtemplate)
- DEPENDS+=+luci-admin-full +PACKAGE_luci-app-hd_idle:hd-idle
+ DEPENDS+=+luci-admin-full +PACKAGE_luci-app-hd-idle:hd-idle
TITLE:=hd-idle
endef
-define Package/luci-app-hd_idle/install
- $(call Package/luci/install/template,$(1),applications/luci-hd_idle)
+define Package/luci-app-hd-idle/install
+ $(call Package/luci/install/template,$(1),applications/luci-hd-idle)
endef
define Package/luci-app-tinyproxy
$(call Package/luci/install/template,$(1),applications/luci-p2pblock)
endef
+define Package/luci-app-multiwan
+ $(call Package/luci/webtemplate)
+ TITLE:=LuCI Support for the OpenWrt MultiWAN agent
+ DEPENDS+=+luci-admin-core +luci-app-firewall \
+ +PACKAGE_luci-app-multiwan:multiwan
+endef
+
+define Package/luci-app-multiwan/install
+ $(call Package/luci/install/template,$(1),applications/luci-multiwan)
+endef
+
+define Package/luci-app-wol
+ $(call Package/luci/webtemplate)
+ TITLE:=LuCI Support for Wake-on-LAN
+ DEPENDS+=+luci-admin-core +PACKAGE_luci-app-wol:etherwake
+endef
+
+define Package/luci-app-wol/install
+ $(call Package/luci/install/template,$(1),applications/luci-wol)
+endef
+
+define Package/luci-app-vnstat
+ $(call Package/luci/webtemplate)
+ TITLE:=LuCI Support for VnStat
+ DEPENDS+=+luci-admin-core +PACKAGE_luci-app-vnstat:vnstat \
+ +PACKAGE_luci-app-vnstat:vnstati
+endef
+
+define Package/luci-app-vnstat/install
+ $(call Package/luci/install/template,$(1),applications/luci-vnstat)
+endef
+
### Server Gateway Interfaces ###
define Package/luci-sgi-cgi
- $(call Package/luci/libtemplate)
- TITLE:=SGI for CGI
+ $(call Package/luci/webservertemplate)
+ TITLE:=CGI Gateway behind existing Webserver
endef
define Package/luci-sgi-cgi/install
$(call Package/luci/install/template,$(1),libs/sgi-cgi)
endef
+define Package/luci-sgi-uhttpd
+ $(call Package/luci/libtemplate)
+ TITLE:=Binding for the uHTTPd server
+ DEPENDS+=+uhttpd +uhttpd-mod-lua
+endef
+
+define Package/luci-sgi-uhttpd/install
+ $(call Package/luci/install/template,$(1),libs/sgi-uhttpd)
+endef
+
+
### Themes ###
define Package/luci-theme-base
$(call Package/luci/thtemplate)
- DEPENDS:=+luci-web
+ DEPENDS:=
TITLE:=Common base for all themes
endef
endef
+define Package/luci-i18n-vietnamese
+ $(call Package/luci/i18ntemplate)
+ TITLE:=Vietnamese (by Hong Phuc Dang)
+endef
+
+define Package/luci-i18n-vietnamese/install
+ $(call Package/luci/install/template,$(1),i18n/vietnamese)
+endef
+
+define Package/luci-i18n-malay
+ $(call Package/luci/i18ntemplate)
+ TITLE:=Malay (by Teow Wai Chet)
+endef
+
+define Package/luci-i18n-malay/install
+ $(call Package/luci/install/template,$(1),i18n/malay)
+endef
+
+
+### Collections ###
+define Package/luci
+ $(call Package/luci/collectiontemplate)
+ TITLE:=Standard OpenWrt set including full and mini admin and the standard theme
+ DEPENDS:=+uhttpd +luci-admin-full +luci-admin-mini +luci-theme-openwrt \
+ +luci-app-firewall +luci-app-initmgr
+endef
+
+define Package/luci/install
+ true
+endef
+
+
+define Package/luci-ssl
+ $(call Package/luci/collectiontemplate)
+ TITLE:=Standard OpenWrt set with https support
+ DEPENDS:=+uhttpd +uhttpd-mod-tls +px5g +luci-admin-full +luci-admin-mini \
+ +luci-theme-openwrt +luci-app-firewall +luci-app-initmgr
+endef
+
+define Package/luci-ssl/install
+ true
+endef
+
+
+define Package/luci-medium
+ $(call Package/luci/collectiontemplate)
+ TITLE:=Medium package set using only admin full and a theme without graphics
+ DEPENDS:=+uhttpd +luci-admin-full +luci-theme-openwrtlight
+endef
+
+define Package/luci-medium/install
+ true
+endef
+
+
+define Package/luci-light
+ $(call Package/luci/collectiontemplate)
+ TITLE:=Minimum package set using only admin mini and a theme without graphics
+ DEPENDS:=+uhttpd +luci-admin-mini +luci-theme-openwrtlight
+endef
+
+define Package/luci-light/install
+ true
+endef
+
+
### Compile ###
ifneq ($(CONFIG_PACKAGE_luci-core),)
PKG_SELECTED_MODULES+=libs/core
endif
-ifneq ($(CONFIG_PACKAGE_luci-cbi),)
- PKG_SELECTED_MODULES+=libs/cbi
-endif
ifneq ($(CONFIG_PACKAGE_luci-fastindex),)
PKG_SELECTED_MODULES+=libs/fastindex
endif
-ifneq ($(CONFIG_PACKAGE_luci-http),)
- PKG_SELECTED_MODULES+=libs/http
-endif
ifneq ($(CONFIG_PACKAGE_luci-httpclient),)
PKG_SELECTED_MODULES+=libs/httpclient
endif
ifneq ($(CONFIG_PACKAGE_luci-luanet),)
PKG_SELECTED_MODULES+=libs/luanet
endif
-ifneq ($(CONFIG_PACKAGE_luci-iwinfo),)
- PKG_SELECTED_MODULES+=libs/iwinfo
-endif
ifneq ($(CONFIG_PACKAGE_luci-lucid),)
PKG_SELECTED_MODULES+=libs/lucid libs/lucid-http
endif
ifneq ($(CONFIG_PACKAGE_luci-px5g),)
PKG_SELECTED_MODULES+=libs/px5g
endif
-ifneq ($(CONFIG_PACKAGE_luci-uci),)
- PKG_SELECTED_MODULES+=libs/uci
-endif
ifneq ($(CONFIG_PACKAGE_luci-sys),)
PKG_SELECTED_MODULES+=libs/sys
endif
ifneq ($(CONFIG_PACKAGE_luci-admin-full),)
PKG_SELECTED_MODULES+=modules/admin-full
endif
+ifneq ($(CONFIG_PACKAGE_luci-niu),)
+ PKG_SELECTED_MODULES+=modules/niu
+endif
ifneq ($(CONFIG_PACKAGE_luci-admin-rpc),)
PKG_SELECTED_MODULES+=modules/rpc
endif
ifneq ($(CONFIG_PACKAGE_luci-app-samba),)
PKG_SELECTED_MODULES+=applications/luci-samba
endif
-ifneq ($(CONFIG_PACKAGE_luci-app-uvc_streamer),)
- PKG_SELECTED_MODULES+=applications/luci-uvc_streamer
-endif
-ifneq ($(CONFIG_PACKAGE_luci-app-mmc_over_gpio),)
- PKG_SELECTED_MODULES+=applications/luci-mmc_over_gpio
+ifneq ($(CONFIG_PACKAGE_luci-app-mmc-over-gpio),)
+ PKG_SELECTED_MODULES+=applications/luci-mmc-over-gpio
endif
ifneq ($(CONFIG_PACKAGE_luci-app-p910nd),)
PKG_SELECTED_MODULES+=applications/luci-p910nd
ifneq ($(CONFIG_PACKAGE_luci-app-ushare),)
PKG_SELECTED_MODULES+=applications/luci-ushare
endif
-ifneq ($(CONFIG_PACKAGE_luci-app-hd_idle),)
- PKG_SELECTED_MODULES+=applications/luci-hd_idle
+ifneq ($(CONFIG_PACKAGE_luci-app-hd-idle),)
+ PKG_SELECTED_MODULES+=applications/luci-hd-idle
endif
ifneq ($(CONFIG_PACKAGE_luci-app-tinyproxy),)
PKG_SELECTED_MODULES+=applications/luci-tinyproxy
ifneq ($(CONFIG_PACKAGE_luci-app-p2pblock),)
PKG_SELECTED_MODULES+=applications/luci-p2pblock
endif
+ifneq ($(CONFIG_PACKAGE_luci-app-multiwan),)
+ PKG_SELECTED_MODULES+=applications/luci-multiwan
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-wol),)
+ PKG_SELECTED_MODULES+=applications/luci-wol
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-vnstat),)
+ PKG_SELECTED_MODULES+=applications/luci-vnstat
+endif
ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),)
PKG_SELECTED_MODULES+=libs/sgi-cgi
endif
+ifneq ($(CONFIG_PACKAGE_luci-sgi-uhttpd),)
+ PKG_SELECTED_MODULES+=libs/sgi-uhttpd
+endif
ifneq ($(CONFIG_PACKAGE_luci-sgi-luci),)
PKG_SELECTED_MODULES+=libs/sgi-luci
endif
ifneq ($(CONFIG_PACKAGE_luci-i18n-spanish),)
PKG_SELECTED_MODULES+=i18n/spanish
endif
+ifneq ($(CONFIG_PACKAGE_luci-i18n-vietnamese),)
+ PKG_SELECTED_MODULES+=i18n/vietnamese
+endif
+ifneq ($(CONFIG_PACKAGE_luci-i18n-malay),)
+ PKG_SELECTED_MODULES+=i18n/malay
+endif
MAKE_FLAGS += \
$(eval $(call BuildPackage,luci-core))
-$(eval $(call BuildPackage,luci-cbi))
$(eval $(call BuildPackage,luci-fastindex))
-$(eval $(call BuildPackage,luci-http))
$(eval $(call BuildPackage,luci-httpclient))
$(eval $(call BuildPackage,luci-ipkg))
$(eval $(call BuildPackage,luci-json))
$(eval $(call BuildPackage,luci-lmo))
$(eval $(call BuildPackage,luci-luanet))
-$(eval $(call BuildPackage,luci-iwinfo))
$(eval $(call BuildPackage,luci-lucid))
$(eval $(call BuildPackage,luci-nixio))
$(eval $(call BuildPackage,luci-px5g))
-$(eval $(call BuildPackage,luci-uci))
$(eval $(call BuildPackage,luci-sys))
$(eval $(call BuildPackage,luci-web))
$(eval $(call BuildPackage,luci-uvl))
$(eval $(call BuildPackage,luci-admin-core))
$(eval $(call BuildPackage,luci-admin-mini))
$(eval $(call BuildPackage,luci-admin-full))
+$(eval $(call BuildPackage,luci-niu))
$(eval $(call BuildPackage,luci-admin-rpc))
$(eval $(call BuildPackage,luci-mod-freifunk))
$(eval $(call BuildPackage,luci-app-ntpc))
$(eval $(call BuildPackage,luci-app-ddns))
$(eval $(call BuildPackage,luci-app-samba))
-$(eval $(call BuildPackage,luci-app-uvc_streamer))
-$(eval $(call BuildPackage,luci-app-mmc_over_gpio))
+$(eval $(call BuildPackage,luci-app-mmc-over-gpio))
$(eval $(call BuildPackage,luci-app-p910nd))
$(eval $(call BuildPackage,luci-app-ushare))
-$(eval $(call BuildPackage,luci-app-hd_idle))
+$(eval $(call BuildPackage,luci-app-hd-idle))
$(eval $(call BuildPackage,luci-app-tinyproxy))
$(eval $(call BuildPackage,luci-app-initmgr))
$(eval $(call BuildPackage,luci-app-livestats))
$(eval $(call BuildPackage,luci-app-polipo))
$(eval $(call BuildPackage,luci-app-openvpn))
$(eval $(call BuildPackage,luci-app-p2pblock))
+$(eval $(call BuildPackage,luci-app-multiwan))
+$(eval $(call BuildPackage,luci-app-wol))
+$(eval $(call BuildPackage,luci-app-vnstat))
$(eval $(call BuildPackage,luci-sgi-cgi))
+$(eval $(call BuildPackage,luci-sgi-uhttpd))
$(eval $(call BuildPackage,luci-theme-base))
$(eval $(call BuildPackage,luci-theme-fledermaus))
$(eval $(call BuildPackage,luci-i18n-catalan))
$(eval $(call BuildPackage,luci-i18n-portuguese))
$(eval $(call BuildPackage,luci-i18n-spanish))
+$(eval $(call BuildPackage,luci-i18n-vietnamese))
+$(eval $(call BuildPackage,luci-i18n-malay))
+
+$(eval $(call BuildPackage,luci))
+$(eval $(call BuildPackage,luci-ssl))
+$(eval $(call BuildPackage,luci-medium))
+$(eval $(call BuildPackage,luci-light))