X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=78654df6c6dce98ba0b70afd32ffa68f1db99821;hb=12a1c6647873bb42d9d0b925fb5abc709d7b6d95;hp=e3a4376035391088d24dfe0ba504b7f8998c8288;hpb=cbaafba1fdbd65ce281e46b71fa7243fa065f90b;p=project%2Fluci.git diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index e3a437603..78654df6c 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -1,6 +1,6 @@ include $(TOPDIR)/rules.mk -PKG_BRANCH:=trunk +PKG_BRANCH:=branches/luci-0.9 ifeq ($(DUMP),) USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1) @@ -14,7 +14,7 @@ ifeq ($(USELOCAL),1) else PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH) ifeq ($(DUMP),) - PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p') + PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne 's/^Revision: //p') PKG_VERSION:=0.9+svn$(PKG_REV) endif PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) @@ -23,11 +23,12 @@ else 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 -PKG_BUILD_DEPENDS:=libnotimpl LUA_TARGET:=source +LUCI_CFLAGS:= PKG_SELECTED_MODULES:= @@ -50,42 +51,41 @@ endef ### Templates ### define Package/luci/libtemplate - SECTION:=admin - CATEGORY:=Administration + SECTION:=luci + CATEGORY:=LuCI TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.freifunk-halle.net/ MAINTAINER:=Steven Barth - SUBMENU:=LuCI Libraries + SUBMENU:=Libraries DEPENDS:=+luci-core endef define Package/luci/fftemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Freifunk Support (GERMAN ONLY) + SUBMENU:=Freifunk DEPENDS:=+luci-mod-freifunk endef -define Package/luci/httpdtemplate - $(call Package/luci/libtemplate) - SUBMENU:=LuCI Non-Forking HTTP-Daemon (EXPERIMENTAL) - DEPENDS:=+luci-httpd -endef - define Package/luci/i18ntemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Translations + SUBMENU:=Translations DEPENDS:=+luci-web endef define Package/luci/thtemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Themes + SUBMENU:=Themes DEPENDS:=+luci-web endef define Package/luci/webtemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Components + SUBMENU:=Components +endef + +define Package/luci/collectiontemplate + $(call Package/luci/libtemplate) + SUBMENU:=Collections endef @@ -100,12 +100,17 @@ endef define Package/luci-core $(call Package/luci/libtemplate) - DEPENDS:=+lua + DEPENDS:=+lua +luci-nixio TITLE:=LuCI core libraries endef define Package/luci-core/install $(call Package/luci/install/template,$(1),libs/core) + $(PKG_BUILD_DIR)/build/mkversion.sh $(1)/usr/lib/lua/luci/version.lua \ + "OpenWrt Firmware" \ + "$(OPENWRTVERSION)" \ + "$(PKG_BRANCH)" \ + "$(PKG_VERSION)" endef define Package/luci-core/config @@ -133,6 +138,10 @@ ifneq ($(CONFIG_PACKAGE_luci-core_stripped),) LUA_TARGET:=strip endif +ifneq ($(CONFIG_PACKAGE_luci-core_zipped),) + LUA_TARGET:=gzip +endif + ### Libraries ### define Package/luci-cbi @@ -177,6 +186,17 @@ define Package/luci-http/install endef +define Package/luci-httpclient + $(call Package/luci/libtemplate) + TITLE:=HTTP(S) client library + DEPENDS+=+luci-http +luci-nixio +endef + +define Package/luci-httpclient/install + $(call Package/luci/install/template,$(1),libs/httpclient) +endef + + define Package/luci-ipkg $(call Package/luci/libtemplate) TITLE:=LuCI IPKG/OPKG call abstraction library @@ -197,6 +217,91 @@ define Package/luci-json/install endef +define Package/luci-lmo + $(call Package/luci/libtemplate) + TITLE:=lmo +endef + +define Package/luci-lmo/install + $(call Package/luci/install/template,$(1),libs/lmo) +endef + + +define Package/luci-luanet + $(call Package/luci/libtemplate) + TITLE:=luanet + DEPENDS+=+libiw +endef + +define Package/luci-luanet/install + $(call Package/luci/install/template,$(1),libs/luanet) +endef + + +define Package/luci-lucid + $(call Package/luci/libtemplate) + TITLE:=LuCId Superserver + DEPENDS+=+luci-nixio +luci-http +luci-px5g +endef + +define Package/luci-lucid/install + $(call Package/luci/install/template,$(1),libs/lucid) + $(call Package/luci/install/template,$(1),libs/lucid-http) +endef + + + +NIXIO_TLS:=axtls + +define Package/luci-nixio + $(call Package/luci/libtemplate) + TITLE:=NIXIO POSIX Library + DEPENDS:=+PACKAGE_luci-nixio_openssl:libopenssl +PACKAGE_luci-nixio_cyassl:libcyassl +endef + +define Package/luci-nixio/install + $(call Package/luci/install/template,$(1),libs/nixio) +endef + +define Package/luci-nixio/config + choice + prompt "TLS Provider" + default PACKAGE_luci-nixio_axtls + + config PACKAGE_luci-nixio_axtls + bool "Builtin (axTLS)" + + config PACKAGE_luci-nixio_cyassl + bool "CyaSSL" + select PACKAGE_libcyassl + + config PACKAGE_luci-nixio_openssl + bool "OpenSSL" + select PACKAGE_libopenssl + endchoice +endef + +ifneq ($(CONFIG_PACKAGE_luci-nixio_openssl),) + NIXIO_TLS:=openssl +endif + +ifneq ($(CONFIG_PACKAGE_luci-nixio_cyassl),) + NIXIO_TLS:=cyassl + LUCI_CFLAGS+=-I$(STAGING_DIR)/usr/include/cyassl +endif + + +define Package/luci-px5g + $(call Package/luci/libtemplate) + TITLE:=PX5G RSA Keymaster + DEPENDS:=+luci-nixio +endef + +define Package/luci-px5g/install + $(call Package/luci/install/template,$(1),libs/px5g) +endef + + define Package/luci-sys $(call Package/luci/libtemplate) TITLE:=LuCI Linux/POSIX system library @@ -209,8 +314,9 @@ endef define Package/luci-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-http +luci-sys +luci-uci +luci-sgi-cgi + DEPENDS+=+luci-http +luci-sys +luci-uci +luci-lucid +luci-sgi-cgi +luci-lmo TITLE:=MVC Webframework + $(call Config,luci.main.lang,string,en,Default Language) endef define Package/luci-web/conffiles @@ -234,31 +340,18 @@ endef -### HTTPD ### - -define Package/luci-httpd - $(call Package/luci/httpdtemplate) - DEPENDS:=+luci-http +luasocket - TITLE:=Server Core -endef - -define Package/luci-httpd/install - $(call Package/luci/install/template,$(1),libs/httpd) -endef - - - ### Community Packages ### define Package/luci-freifunk-community $(call Package/luci/fftemplate) DEPENDS+= \ - +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ + +luci-lucid +luci-sgi-cgi +luci-app-splash \ +luci-app-ffwizard-leipzig \ - +luci-theme-fledermaus \ +luci-i18n-german \ - +olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice \ - +kmod-tun +ip + +PACKAGE_luci-freifunk-community:olsrd-luci +PACKAGE_luci-freifunk-community:olsrd-luci-mod-dyn-gw-plain \ + +PACKAGE_luci-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-freifunk-community:olsrd-luci-mod-nameservice \ + +PACKAGE_luci-freifunk-community:olsrd-luci-mod-watchdog +PACKAGE_luci-freifunk-community:kmod-tun \ + +PACKAGE_luci-freifunk-community:ip +PACKAGE_luci-freifunk-community:freifunk-watchdog +luci-app-olsr TITLE:=Freifunk Community Meta-Package endef @@ -270,17 +363,13 @@ endef define Package/luci-admin-core $(call Package/luci/webtemplate) - DEPENDS+=+luci-web +luci-cbi +luci-theme-openwrt +luci-i18n-english + DEPENDS+=+luci-web +luci-cbi +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 @@ -319,7 +408,7 @@ endef define Package/luci-mod-freifunk $(call Package/luci/fftemplate) - DEPENDS:=+luci-admin-full + DEPENDS:=+luci-admin-full +luci-json +PACKAGE_luci-mod-freifunk:freifunk-firewall TITLE:=LuCI Freifunk module endef @@ -345,9 +434,20 @@ define Package/luci-app-ffwizard-leipzig/install endef +define Package/luci-app-siitwizard + $(call Package/luci/fftemplate) + TITLE:=SIIT IPv4-over-IPv6 configuration wizard + DEPENDS:=+luci-admin-core +PACKAGE_luci-app-siitwizard:kmod-siit +endef + +define Package/luci-app-siitwizard/install + $(call Package/luci/install/template,$(1),applications/luci-siitwizard) +endef + + define Package/luci-app-firewall $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-firewall:firewall TITLE:=Firewall and Portforwarding application endef @@ -358,7 +458,8 @@ endef define Package/luci-app-olsr $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +olsrd-luci +olsrd-luci-mod-txtinfo + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-olsr:olsrd-luci \ + +PACKAGE_luci-app-olsr:olsrd-luci-mod-txtinfo TITLE:=OLSR configuration and status module endef @@ -369,7 +470,7 @@ endef define Package/luci-app-qos $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +qos-scripts + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-qos:qos-scripts TITLE:=Quality of Service configuration module endef @@ -380,7 +481,10 @@ endef define Package/luci-app-splash $(call Package/luci/fftemplate) - DEPENDS+=+luasocket + DEPENDS+=+PACKAGE_luci-app-splash:luci-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 TITLE:=Freifunk DHCP-Splash application endef @@ -395,7 +499,12 @@ endef define Package/luci-app-statistics $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +collectd +collectd-mod-rrdtool1 +rrdtool1 + DEPENDS+=+luci-admin-full +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 TITLE:=LuCI Statistics Application endef @@ -407,10 +516,9 @@ define Package/luci-app-statistics/install $(call Package/luci/install/template,$(1),applications/luci-statistics) endef - define Package/luci-app-upnp $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +miniupnpd + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-upnp:miniupnpd TITLE:=Universal Plug & Play configuration module endef @@ -421,7 +529,7 @@ endef define Package/luci-app-ntpc $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +ntpclient + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-ntpc:ntpclient TITLE:=NTP time synchronisation client configuration module endef @@ -432,7 +540,7 @@ endef define Package/luci-app-ddns $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +ddns-scripts + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-ddns:ddns-scripts TITLE:=Dynamic DNS configuration module endef @@ -443,7 +551,7 @@ endef define Package/luci-app-samba $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +samba3 + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-samba:samba3 TITLE:=Network Shares - Samba SMB/CIFS module endef @@ -452,31 +560,20 @@ define Package/luci-app-samba/install endef -define Package/luci-app-uvc_streamer +define Package/luci-app-mmc-over-gpio $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +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 +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 define Package/luci-app-p910nd $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +p910nd + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-p910nd:p910nd TITLE:=p910nd - Printer server module endef @@ -487,7 +584,7 @@ endef define Package/luci-app-ushare $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +ushare + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-ushare:ushare TITLE:=ushare - UPnP A/V & DLNA Media Server endef @@ -495,19 +592,19 @@ define Package/luci-app-ushare/install $(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 +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/webtemplate) - DEPENDS+=+luci-admin-full +tinyproxy + DEPENDS+=+luci-admin-full +PACKAGE_luci-app-tinyproxy:tinyproxy TITLE:=Tinyproxy - HTTP(S)-Proxy endef @@ -527,62 +624,55 @@ endef define Package/luci-app-livestats $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +luci-admin-rpc - TITLE:=LuCI Realtime Statistics (Experimental) + DEPENDS+=+luci-admin-core +luci-admin-rpc + TITLE:=LuCI Realtime Statistics endef define Package/luci-app-livestats/install $(call Package/luci/install/template,$(1),applications/luci-livestats) endef -define Package/luci-app-asterisk - $(call Package/luci/webtemplate) - TITLE:=LuCI Support for Asterisk PBX (Incomplete) -endef - -define Package/luci-app-asterisk/install - $(call Package/luci/install/template,$(1),applications/luci-asterisk) -endef - define Package/luci-app-polipo $(call Package/luci/webtemplate) TITLE:=LuCI Support for the Polipo Proxy - DEPENDS+=+luci-admin-core +polipo + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-polipo:polipo endef define Package/luci-app-polipo/install $(call Package/luci/install/template,$(1),applications/luci-polipo) endef - -### Server Gateway Interfaces ### - -define Package/luci-sgi-cgi - $(call Package/luci/libtemplate) - TITLE:=SGI for CGI +define Package/luci-app-openvpn + $(call Package/luci/webtemplate) + TITLE:=LuCI Support for OpenVPN + DEPENDS+=+luci-admin-core +PACKAGE_luci-app-openvpn:openvpn endef -define Package/luci-sgi-cgi/install - $(call Package/luci/install/template,$(1),libs/sgi-cgi) +define Package/luci-app-openvpn/install + $(call Package/luci/install/template,$(1),applications/luci-openvpn) endef -define Package/luci-sgi-luci - $(call Package/luci/libtemplate) - DEPENDS+=+luci-httpd - TITLE:=SGI for LuCI HTTPD +define Package/luci-app-p2pblock + $(call Package/luci/webtemplate) + TITLE:=LuCI Support for the Freifunk P2P-Block addon + DEPENDS+=+luci-admin-core +luci-app-firewall \ + +PACKAGE_luci-app-p2pblock:freifunk-p2pblock endef -define Package/luci-sgi-luci/install - $(call Package/luci/install/template,$(1),libs/sgi-luci) +define Package/luci-app-p2pblock/install + $(call Package/luci/install/template,$(1),applications/luci-p2pblock) endef -define Package/luci-sgi-webuci + +### Server Gateway Interfaces ### + +define Package/luci-sgi-cgi $(call Package/luci/libtemplate) - TITLE:=SGI for Webuci + TITLE:=SGI for CGI endef -define Package/luci-sgi-webuci/install - $(call Package/luci/install/template,$(1),libs/sgi-webuci) +define Package/luci-sgi-cgi/install + $(call Package/luci/install/template,$(1),libs/sgi-cgi) endef ### Themes ### @@ -607,7 +697,7 @@ define Package/luci-theme-fledermaus/install endef define Package/luci-theme-freifunk - $(call Package/luci/thtemplate) + $(call Package/luci/fftemplate) DEPENDS:=+luci-web MAINTAINER:=Stefan Pirwitz TITLE:=alternative Freifunk Theme @@ -618,7 +708,7 @@ define Package/luci-theme-freifunk/install endef define Package/luci-theme-freifunk-bno - $(call Package/luci/thtemplate) + $(call Package/luci/fftemplate) DEPENDS:=+luci-web MAINTAINER:=Stefan Pirwitz TITLE:=Freifunk Berlin Nordost Theme @@ -628,10 +718,22 @@ define Package/luci-theme-freifunk-bno/install $(call Package/luci/install/template,$(1),themes/freifunk-bno) endef +define Package/luci-theme-freifunk-hannover + $(call Package/luci/fftemplate) + DEPENDS:=+luci-web + MAINTAINER:=Mikolas Bingemer + TITLE:=Freifunk Hannover Theme +endef + +define Package/luci-theme-freifunk-hannover/install + $(call Package/luci/install/template,$(1),themes/freifunk-hannover) +endef + define Package/luci-theme-openwrt $(call Package/luci/thtemplate) TITLE:=OpenWrt.org (default) - DEPENDS:=+luci-theme-base + DEPENDS:=+luci-theme-base luci-core + DEFAULT:=y if PACKAGE_luci-core endef define Package/luci-theme-openwrt/install @@ -680,6 +782,16 @@ define Package/luci-i18n-french/install endef +define Package/luci-i18n-italian + $(call Package/luci/i18ntemplate) + TITLE:=Italian (by Matteo Croce) +endef + +define Package/luci-i18n-italian/install + $(call Package/luci/install/template,$(1),i18n/italian) +endef + + define Package/luci-i18n-russian $(call Package/luci/i18ntemplate) TITLE:=Russian (by Skryabin Dmitry) @@ -700,6 +812,79 @@ define Package/luci-i18n-portuguese_brazilian/install endef +define Package/luci-i18n-japanese + $(call Package/luci/i18ntemplate) + TITLE:=Japanese (by Tsukasa Hamano) +endef + +define Package/luci-i18n-japanese/install + $(call Package/luci/install/template,$(1),i18n/japanese) +endef + + +define Package/luci-i18n-greek + $(call Package/luci/i18ntemplate) + TITLE:=Greek (by Vasilis Tsiligiannis) +endef + +define Package/luci-i18n-greek/install + $(call Package/luci/install/template,$(1),i18n/greek) +endef + + +define Package/luci-i18n-catalan + $(call Package/luci/i18ntemplate) + TITLE:=Catalan (by Eduard Duran) +endef + +define Package/luci-i18n-catalan/install + $(call Package/luci/install/template,$(1),i18n/catalan) +endef + + +define Package/luci-i18n-portuguese + $(call Package/luci/i18ntemplate) + TITLE:=Portuguese (by Jose Monteiro) +endef + +define Package/luci-i18n-portuguese/install + $(call Package/luci/install/template,$(1),i18n/portuguese) +endef + + +define Package/luci-i18n-spanish + $(call Package/luci/i18ntemplate) + TITLE:=Spanish (by Guillermo Javier Nardoni) +endef + +define Package/luci-i18n-spanish/install + $(call Package/luci/install/template,$(1),i18n/spanish) +endef + + +### Collections ### +define Package/luci + $(call Package/luci/collectiontemplate) + TITLE:=Standard OpenWrt Kamikaze set including full and mini admin and the standard theme + DEPENDS:=+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-light + $(call Package/luci/collectiontemplate) + TITLE:=Minimum package set using only admin mini and a theme without grafics + DEPENDS:=+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 @@ -713,12 +898,30 @@ 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-ipkg),) PKG_SELECTED_MODULES+=libs/ipkg endif ifneq ($(CONFIG_PACKAGE_luci-json),) PKG_SELECTED_MODULES+=libs/json endif +ifneq ($(CONFIG_PACKAGE_luci-lmo),) + PKG_SELECTED_MODULES+=libs/lmo +endif +ifneq ($(CONFIG_PACKAGE_luci-luanet),) + PKG_SELECTED_MODULES+=libs/luanet +endif +ifneq ($(CONFIG_PACKAGE_luci-lucid),) + PKG_SELECTED_MODULES+=libs/lucid libs/lucid-http +endif +ifneq ($(CONFIG_PACKAGE_luci-nixio),) + PKG_SELECTED_MODULES+=libs/nixio +endif +ifneq ($(CONFIG_PACKAGE_luci-px5g),) + PKG_SELECTED_MODULES+=libs/px5g +endif ifneq ($(CONFIG_PACKAGE_luci-uci),) PKG_SELECTED_MODULES+=libs/uci endif @@ -732,10 +935,6 @@ ifneq ($(CONFIG_PACKAGE_luci-uvl),) PKG_SELECTED_MODULES+=libs/uvl endif -ifneq ($(CONFIG_PACKAGE_luci-httpd),) - PKG_SELECTED_MODULES+=libs/httpd -endif - ifneq ($(CONFIG_PACKAGE_luci-admin-core),) PKG_SELECTED_MODULES+=modules/admin-core endif @@ -759,6 +958,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-ffwizard-leipzig),) PKG_SELECTED_MODULES+=applications/luci-ffwizard-leipzig endif +ifneq ($(CONFIG_PACKAGE_luci-app-siitwizard),) + PKG_SELECTED_MODULES+=applications/luci-siitwizard +endif ifneq ($(CONFIG_PACKAGE_luci-app-firewall),) PKG_SELECTED_MODULES+=applications/luci-fw endif @@ -786,11 +988,8 @@ 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 @@ -798,8 +997,8 @@ endif 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 @@ -810,12 +1009,15 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-livestats),) PKG_SELECTED_MODULES+=applications/luci-livestats endif -ifneq ($(CONFIG_PACKAGE_luci-app-asterisk),) - PKG_SELECTED_MODULES+=applications/luci-asterisk -endif ifneq ($(CONFIG_PACKAGE_luci-app-polipo),) PKG_SELECTED_MODULES+=applications/luci-polipo endif +ifneq ($(CONFIG_PACKAGE_luci-app-openvpn),) + PKG_SELECTED_MODULES+=applications/luci-openvpn +endif +ifneq ($(CONFIG_PACKAGE_luci-app-p2pblock),) + PKG_SELECTED_MODULES+=applications/luci-p2pblock +endif ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),) @@ -824,9 +1026,6 @@ endif ifneq ($(CONFIG_PACKAGE_luci-sgi-luci),) PKG_SELECTED_MODULES+=libs/sgi-luci endif -ifneq ($(CONFIG_PACKAGE_luci-sgi-webuci),) - PKG_SELECTED_MODULES+=libs/sgi-webuci -endif ifneq ($(CONFIG_PACKAGE_luci-theme-base),) PKG_SELECTED_MODULES+=themes/base @@ -837,6 +1036,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-theme-freifunk-bno),) PKG_SELECTED_MODULES+=themes/freifunk-bno endif +ifneq ($(CONFIG_PACKAGE_luci-theme-freifunk-hannover),) + PKG_SELECTED_MODULES+=themes/freifunk-hannover +endif ifneq ($(CONFIG_PACKAGE_luci-theme-freifunk),) PKG_SELECTED_MODULES+=themes/freifunk endif @@ -856,36 +1058,58 @@ endif ifneq ($(CONFIG_PACKAGE_luci-i18n-french),) PKG_SELECTED_MODULES+=i18n/french endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-italian),) + PKG_SELECTED_MODULES+=i18n/italian +endif ifneq ($(CONFIG_PACKAGE_luci-i18n-russian),) PKG_SELECTED_MODULES+=i18n/russian endif ifneq ($(CONFIG_PACKAGE_luci-i18n-portuguese_brazilian),) PKG_SELECTED_MODULES+=i18n/portuguese_brazilian endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-japanese),) + PKG_SELECTED_MODULES+=i18n/japanese +endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-greek),) + PKG_SELECTED_MODULES+=i18n/greek +endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-catalan),) + PKG_SELECTED_MODULES+=i18n/catalan +endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-portuguese),) + PKG_SELECTED_MODULES+=i18n/portuguese +endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-spanish),) + PKG_SELECTED_MODULES+=i18n/spanish +endif MAKE_FLAGS += \ MODULES="$(PKG_SELECTED_MODULES)" \ LUA_TARGET="$(LUA_TARGET)" \ - LUA_SHLIBS="-llua -lm" \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ + CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ - OS="Linux" + NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" $(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-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-httpd)) - $(eval $(call BuildPackage,luci-admin-core)) $(eval $(call BuildPackage,luci-admin-mini)) $(eval $(call BuildPackage,luci-admin-full)) @@ -895,6 +1119,7 @@ $(eval $(call BuildPackage,luci-mod-freifunk)) $(eval $(call BuildPackage,luci-freifunk-community)) $(eval $(call BuildPackage,luci-app-ffwizard-leipzig)) +$(eval $(call BuildPackage,luci-app-siitwizard)) $(eval $(call BuildPackage,luci-app-firewall)) $(eval $(call BuildPackage,luci-app-olsr)) $(eval $(call BuildPackage,luci-app-qos)) @@ -904,30 +1129,38 @@ $(eval $(call BuildPackage,luci-app-upnp)) $(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-asterisk)) $(eval $(call BuildPackage,luci-app-polipo)) +$(eval $(call BuildPackage,luci-app-openvpn)) +$(eval $(call BuildPackage,luci-app-p2pblock)) $(eval $(call BuildPackage,luci-sgi-cgi)) -$(eval $(call BuildPackage,luci-sgi-luci)) -$(eval $(call BuildPackage,luci-sgi-webuci)) $(eval $(call BuildPackage,luci-theme-base)) $(eval $(call BuildPackage,luci-theme-fledermaus)) $(eval $(call BuildPackage,luci-theme-freifunk)) $(eval $(call BuildPackage,luci-theme-freifunk-bno)) +$(eval $(call BuildPackage,luci-theme-freifunk-hannover)) $(eval $(call BuildPackage,luci-theme-openwrt)) $(eval $(call BuildPackage,luci-theme-openwrtlight)) $(eval $(call BuildPackage,luci-i18n-german)) $(eval $(call BuildPackage,luci-i18n-english)) $(eval $(call BuildPackage,luci-i18n-french)) +$(eval $(call BuildPackage,luci-i18n-italian)) $(eval $(call BuildPackage,luci-i18n-russian)) $(eval $(call BuildPackage,luci-i18n-portuguese_brazilian)) +$(eval $(call BuildPackage,luci-i18n-japanese)) +$(eval $(call BuildPackage,luci-i18n-greek)) +$(eval $(call BuildPackage,luci-i18n-catalan)) +$(eval $(call BuildPackage,luci-i18n-portuguese)) +$(eval $(call BuildPackage,luci-i18n-spanish)) + +$(eval $(call BuildPackage,luci)) +$(eval $(call BuildPackage,luci-light))