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
+PKG_USE_MIPS16:=0
LUA_TARGET:=source
LUCI_CFLAGS:=
### Core package ###
-define Package/luci-lib-core
+define Package/luci-base
SECTION:=luci
CATEGORY:=LuCI
TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.subsignal.org/
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
SUBMENU:=8. Libraries
- DEPENDS:=+lua +libuci-lua
+ DEPENDS:=+lua +libuci-lua +libubus-lua
TITLE:=LuCI core libraries
endef
-define Package/luci-lib-core/install
- $(call Package/luci/install/template,$(1),libs/core)
+define Package/luci-base/install
+ $(call Package/luci/install/template,$(1),modules/base)
$(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \
"OpenWrt Firmware" \
"$(OPENWRTVERSION)" \
- "$(PKG_BRANCH)" \
+ "trunk" \
"$(PKG_VERSION)"
endef
-define Package/luci-lib-core/config
+define Package/luci-base/config
choice
prompt "Build Target"
- default PACKAGE_luci-lib-core_source
+ default PACKAGE_luci-base_source
- config PACKAGE_luci-lib-core_compile
+ config PACKAGE_luci-base_compile
bool "Precompiled"
- config PACKAGE_luci-lib-core_stripped
+ config PACKAGE_luci-base_stripped
bool "Stripped"
- config PACKAGE_luci-lib-core_srcdiet
+ config PACKAGE_luci-base_srcdiet
bool "Compressed Source"
- config PACKAGE_luci-lib-core_source
+ config PACKAGE_luci-base_source
bool "Full Source"
endchoice
endef
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_compile),)
+define Package/luci-base/conffiles
+/etc/config/luci
+endef
+
+ifneq ($(CONFIG_PACKAGE_luci-base_compile),)
LUA_TARGET:=compile
endif
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_stripped),)
+ifneq ($(CONFIG_PACKAGE_luci-base_stripped),)
LUA_TARGET:=strip
endif
-ifneq ($(CONFIG_PACKAGE_luci-lib-core_srcdiet),)
+ifneq ($(CONFIG_PACKAGE_luci-base_srcdiet),)
LUA_TARGET:=diet
endif
-ifneq ($(CONFIG_PACKAGE_luci-lib-core),)
- LUCI_SELECTED_MODULES+=libs/core
+ifneq ($(CONFIG_PACKAGE_luci-base),)
+ LUCI_SELECTED_MODULES+=modules/base
endif
-LUCI_BUILD_PACKAGES += luci-lib-core
+LUCI_BUILD_PACKAGES += luci-base
### Libraries ###
MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
SUBMENU:=8. Libraries
TITLE:=$(if $(2),$(2),LuCI $(1) library)
- $(if $(3),DEPENDS:=+luci-lib-core $(3))
+ $(if $(3),DEPENDS:=+luci-base $(3))
endef
define Package/luci-lib-$(1)/install
LUCI_BUILD_PACKAGES += luci-lib-$(1)
endef
-define Package/luci-lib-web/conffiles
-/etc/config/luci
-endef
-
define Package/luci-lib-nixio/config
choice
prompt "TLS Provider"
endif
-$(eval $(call library,fastindex,Fastindex indexing module))
-$(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,httpclient,HTTP(S) client library,+luci-base +luci-lib-nixio))
$(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,luaneightbl,neightbl - Lua lib for IPv6 neighbors,+luci-base))
### Protocols ###
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,+relayd))
-
-
-### Community Packages ###
-define Package/luci-mod-freifunk-community
- SECTION:=luci
- CATEGORY:=LuCI
- TITLE:=LuCI - Lua Configuration Interface
- URL:=http://luci.subsignal.org/
- MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- SUBMENU:=9. Freifunk
- TITLE:=Freifunk Community Meta-Package
- DEPENDS+= \
- +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
- $(call Package/luci/install/template,$(1),applications/freifunk-community)
-endef
-
-ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk-community),)
- LUCI_SELECTED_MODULES+=applications/freifunk-community
-endif
-
-LUCI_BUILD_PACKAGES += luci-mod-freifunk-community
+$(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))
### Modules ###
endef
-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-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,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-base @BROKEN))
+$(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-base))
+$(eval $(call module,failsafe,LuCI Fail-Safe - Fail-Safe sysupgrade module,+luci-base))
$(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,niu,NIU - Next Generation Interface,+luci-mod-admin-core @BROKEN))
### Applications ###
LUCI_BUILD_PACKAGES += luci-app-$(1)
endef
-define Package/luci-app-splash/conffiles
-/etc/config/luci_splash
-/usr/lib/luci-splash/splashtext.html
-endef
-
-define Package/luci-app-statistics/conffiles
-/etc/config/luci_statistics
-endef
-
-define Package/luci-app-diag-devinfo/conffiles
-/etc/config/luci_devinfo
-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,meshwizard, Shellscript based wizard to setup mesh networks,\
- +PACKAGE_luci-app-freifunk-meshwizard:meshwizard))
-
-$(eval $(call application,olsr,OLSR configuration and status module,\
- +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 +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-interface \
- +PACKAGE_luci-app-statistics:collectd-mod-load))
-
-
-$(eval $(call application,diag-core,LuCI Diagnostics Tools (Core)))
-
-$(eval $(call application,diag-devinfo,LuCI Diagnostics Tools (Device Info),\
- +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))
-
-$(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,upnp,Universal Plug & Play configuration module,\
- +PACKAGE_luci-app-upnp:miniupnpd))
-
-$(eval $(call application,ntpc,NTP time synchronisation configuration module,\
- +PACKAGE_luci-app-ntpc:ntpclient))
-
-$(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))
-
-$(eval $(call application,mmc-over-gpio,MMC-over-GPIO configuration module,\
- +PACKAGE_luci-app-mmc-over-gpio:kmod-mmc-over-gpio))
-
-$(eval $(call application,p910nd,p910nd - Printer server module,\
- +PACKAGE_luci-app-p910nd:p910nd))
-
-$(eval $(call application,ushare,uShare - UPnP A/V & DLNA Media Server,\
- +PACKAGE_luci-app-ushare:ushare))
-
-$(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,\
- +PACKAGE_luci-app-hd-idle:hd-idle))
-
-$(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,\
- +PACKAGE_luci-app-tinyproxy:tinyproxy))
-
-$(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))
-
-$(eval $(call application,p2pblock,LuCI Support for the Freifunk P2P-Block addon,\
- 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))
-
-$(eval $(call application,wol,LuCI Support for Wake-on-LAN,\
- +PACKAGE_luci-app-wol:etherwake))
-
-$(eval $(call application,vnstat,LuCI Support for VnStat,\
- +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,lqtapifoss,Lantiq voip))
-
-### Server Gateway Interfaces ###
-define sgi
- define Package/luci-sgi-$(1)
- SECTION:=luci
- CATEGORY:=LuCI
- TITLE:=LuCI - Lua Configuration Interface
- URL:=http://luci.subsignal.org/
- MAINTAINER:=LuCI Development Team <luci@lists.subsignal.org>
- SUBMENU:=7. Server Interfaces
- TITLE:=$(if $(2),$(2),LuCI $(1) server gateway interface)
- DEPENDS:=$(3)
- endef
-
- define Package/luci-sgi-$(1)/install
- $(call Package/luci/install/template,$$(1),libs/sgi-$(1))
- endef
-
- ifneq ($(CONFIG_PACKAGE_luci-sgi-$(1)),)
- LUCI_SELECTED_MODULES+=libs/sgi-$(1)
- endif
-
- LUCI_BUILD_PACKAGES += luci-sgi-$(1)
-endef
-
-$(eval $(call sgi,cgi,CGI Gateway behind existing Webserver))
-$(eval $(call sgi,uhttpd,Binding for the uHTTPd server,+uhttpd +uhttpd-mod-lua))
+$(eval $(call application,commands,LuCI Shell Command Module))
### Themes ###
URL:=http://luci.subsignal.org/
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:=PACKAGE_luci-lib-core)
+ MAINTAINER:=$(if $(3),$(3),LuCI Development Team <luci@lists.subsignal.org>)
endef
define Package/luci-theme-$(1)/install
LUCI_BUILD_PACKAGES += luci-theme-$(1)
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 <stefan-at-freifunk-bno-dot-de>))
+$(eval $(call theme,openwrt,OpenWrt.org))
+$(eval $(call theme,bootstrap,Bootstrap Theme (default)))
-$(eval $(call theme,freifunk-bno,Freifunk Berlin Nordost Theme,\
- Stefan Pirwitz <stefan-at-freifunk-bno-dot-de>))
-
-$(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
$(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,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 ###
$(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))
+ +uhttpd +uhttpd-mod-ubus +luci-mod-admin-full +luci-theme-bootstrap \
+ +luci-app-firewall +luci-proto-ppp +libiwinfo-lua +luci-lib-nixio))
$(eval $(call collection,ssl,\
Standard OpenWrt set with HTTPS support,\
- +luci +uhttpd-mod-tls +px5g))
+ +luci +libustream-polarssl +px5g))
$(eval $(call collection,light,\
Minimum package set using only admin mini and the standard theme,\
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='*.o' --exclude='*.so' \
--exclude=dist | \
tar x -C $(PKG_BUILD_DIR)/
- endef
-endif
+ $(call Build/Prepare/Default)
+endef
define Build/Configure
endef
projects / project / luci.git / blobdiff