X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=6229646c80752b13270a7e044ca1095942b9140d;hp=3b3e0b41ea813859175fe2df86cc43ce300961c7;hb=7af6503b1e70b5f6d80db7433904bc6baefb08a3;hpb=a72a8e4474e8442849063e7a9d03609758410707 diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 3b3e0b41e..6229646c8 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -23,6 +23,7 @@ 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 @@ -30,6 +31,10 @@ LUA_TARGET:=source LUCI_CFLAGS:= PKG_SELECTED_MODULES:= +ifeq ($(BOARD),brcm-2.4) + MAKE_FLAGS += CRAP="1" +endif + include $(INCLUDE_DIR)/package.mk @@ -50,42 +55,51 @@ 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:=Internal Libraries DEPENDS:=+luci-core endef -define Package/luci/fftemplate +define Package/luci/webservertemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Freifunk Support - DEPENDS:=+luci-mod-freifunk + SUBMENU:=Webserver endef -define Package/luci/httpdtemplate +define Package/luci/fftemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCIttpd - DEPENDS:=+luci-httpd + SUBMENU:=Freifunk + DEPENDS:=+luci-mod-freifunk 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/maintemplate + $(call Package/luci/libtemplate) + SUBMENU:= +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,7 +114,7 @@ endef define Package/luci-core $(call Package/luci/libtemplate) - DEPENDS:=+lua + DEPENDS:=+lua +luci-nixio TITLE:=LuCI core libraries endef @@ -127,9 +141,6 @@ define Package/luci-core/config config PACKAGE_luci-core_source bool "Full Source" - config PACKAGE_luci-core_zipped - bool "Precompiled and compressed" - endchoice endef @@ -220,6 +231,16 @@ 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 @@ -231,9 +252,19 @@ define Package/luci-luanet/install endef -define Package/luci-lucid +define Package/luci-iwinfo $(call Package/luci/libtemplate) - TITLE:=LuCId Superserver + 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/webservertemplate) + TITLE:=LuCId Full-Stack Webserver DEPENDS+=+luci-nixio +luci-http +luci-px5g endef @@ -244,12 +275,12 @@ endef -NIXIO_TLS:=axtls +NIXIO_TLS:= define Package/luci-nixio $(call Package/luci/libtemplate) - TITLE:=NIXIO Socket Library - DEPENDS:= + TITLE:=NIXIO POSIX Library + DEPENDS:=+PACKAGE_luci-nixio_openssl:libopenssl +PACKAGE_luci-nixio_cyassl:libcyassl endef define Package/luci-nixio/install @@ -259,16 +290,17 @@ endef 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)" - select PACKAGE_dropbear - select PACKAGE_dropbearconvert config PACKAGE_luci-nixio_cyassl bool "CyaSSL" - select PACKAGE_libcyassl-luci + select PACKAGE_libcyassl config PACKAGE_luci-nixio_openssl bool "OpenSSL" @@ -276,6 +308,10 @@ define Package/luci-nixio/config endchoice endef +ifneq ($(CONFIG_PACKAGE_luci-nixio_axtls),) + NIXIO_TLS:=axtls +endif + ifneq ($(CONFIG_PACKAGE_luci-nixio_openssl),) NIXIO_TLS:=openssl endif @@ -287,8 +323,8 @@ 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 @@ -300,6 +336,7 @@ endef define Package/luci-sys $(call Package/luci/libtemplate) TITLE:=LuCI Linux/POSIX system library + DEPENDS:=+luci-iwinfo endef define Package/luci-sys/install @@ -309,9 +346,10 @@ endef define Package/luci-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-http +luci-sys +luci-uci +luci-lucid +luci-sgi-cgi + DEPENDS+=+luci-http +luci-sys +luci-nixio +luci-uci \ + +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 @@ -335,26 +373,12 @@ endef -### HTTPD ### - -define Package/luci-httpd - $(call Package/luci/httpdtemplate) - DEPENDS:=+luci-http +libuci - TITLE:=Server Core -endef - -define Package/luci-httpd/install - $(call Package/luci/install/template,$(1),libs/lucittpd) -endef - - - ### Community Packages ### 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 \ @@ -376,17 +400,22 @@ define Package/luci-admin-core 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 @@ -422,7 +451,7 @@ endef define Package/luci-mod-freifunk $(call Package/luci/fftemplate) - DEPENDS:=+luci-admin-full +luci-json + DEPENDS:=+luci-admin-full +luci-json +PACKAGE_luci-mod-freifunk:freifunk-firewall TITLE:=LuCI Freifunk module endef @@ -515,7 +544,7 @@ define Package/luci-app-statistics $(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 @@ -530,6 +559,56 @@ define Package/luci-app-statistics/install $(call Package/luci/install/template,$(1),applications/luci-statistics) endef +define Package/luci-app-diag-core + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-core + TITLE:=LuCI Diagnostics Tools (Core) +endef + +define Package/luci-app-diag-devinfo + $(call Package/luci/webtemplate) + 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-core + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-core + TITLE:=LuCI Voice Software (Core) +endef + +define Package/luci-app-voice-diag + $(call Package/luci/webtemplate) + 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 + +define Package/luci-app-diag-devinfo/conffiles +/etc/config/luci_devinfo +endef + +define Package/luci-app-diag-core/install + $(call Package/luci/install/template,$(1),applications/luci-diag-core) +endef + +define Package/luci-app-diag-devinfo/install + $(call Package/luci/install/template,$(1),applications/luci-diag-devinfo) +endef + +define Package/luci-app-voice-core/install + $(call Package/luci/install/template,$(1),applications/luci-voice-core) +endef + +define Package/luci-app-voice-diag/install + $(call Package/luci/install/template,$(1),applications/luci-voice-diag) +endef define Package/luci-app-upnp $(call Package/luci/webtemplate) @@ -575,25 +654,14 @@ 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 +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 @@ -618,14 +686,14 @@ 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 +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 @@ -703,18 +771,29 @@ 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/webservertemplate) + 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 @@ -768,7 +847,8 @@ 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 @@ -887,6 +967,49 @@ define Package/luci-i18n-portuguese/install 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 + + +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 + + +### 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 @@ -909,9 +1032,15 @@ 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-iwinfo),) + PKG_SELECTED_MODULES+=libs/iwinfo +endif ifneq ($(CONFIG_PACKAGE_luci-lucid),) PKG_SELECTED_MODULES+=libs/lucid libs/lucid-http endif @@ -934,10 +1063,6 @@ ifneq ($(CONFIG_PACKAGE_luci-uvl),) PKG_SELECTED_MODULES+=libs/uvl endif -ifneq ($(CONFIG_PACKAGE_luci-httpd),) - PKG_SELECTED_MODULES+=libs/lucittpd -endif - ifneq ($(CONFIG_PACKAGE_luci-admin-core),) PKG_SELECTED_MODULES+=modules/admin-core endif @@ -947,6 +1072,9 @@ 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 @@ -979,6 +1107,18 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-statistics),) PKG_SELECTED_MODULES+=applications/luci-statistics endif +ifneq ($(CONFIG_PACKAGE_luci-app-voice-core),) + PKG_SELECTED_MODULES+=applications/luci-voice-core +endif +ifneq ($(CONFIG_PACKAGE_luci-app-voice-diag),) + PKG_SELECTED_MODULES+=applications/luci-voice-diag +endif +ifneq ($(CONFIG_PACKAGE_luci-app-diag-core),) + PKG_SELECTED_MODULES+=applications/luci-diag-core +endif +ifneq ($(CONFIG_PACKAGE_luci-app-diag-devinfo),) + PKG_SELECTED_MODULES+=applications/luci-diag-devinfo +endif ifneq ($(CONFIG_PACKAGE_luci-app-upnp),) PKG_SELECTED_MODULES+=applications/luci-upnp endif @@ -991,11 +1131,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 @@ -1003,8 +1140,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 @@ -1032,12 +1169,12 @@ 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-sgi-webuci),) - PKG_SELECTED_MODULES+=libs/sgi-webuci -endif ifneq ($(CONFIG_PACKAGE_luci-theme-base),) PKG_SELECTED_MODULES+=themes/base @@ -1091,6 +1228,12 @@ 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 +ifneq ($(CONFIG_PACKAGE_luci-i18n-vietnamese),) + PKG_SELECTED_MODULES+=i18n/vietnamese +endif MAKE_FLAGS += \ @@ -1109,7 +1252,9 @@ $(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)) @@ -1118,11 +1263,10 @@ $(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)) +$(eval $(call BuildPackage,luci-niu)) $(eval $(call BuildPackage,luci-admin-rpc)) $(eval $(call BuildPackage,luci-mod-freifunk)) @@ -1135,15 +1279,18 @@ $(eval $(call BuildPackage,luci-app-olsr)) $(eval $(call BuildPackage,luci-app-qos)) $(eval $(call BuildPackage,luci-app-splash)) $(eval $(call BuildPackage,luci-app-statistics)) +$(eval $(call BuildPackage,luci-app-diag-core)) +$(eval $(call BuildPackage,luci-app-diag-devinfo)) +$(eval $(call BuildPackage,luci-app-voice-core)) +$(eval $(call BuildPackage,luci-app-voice-diag)) $(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)) @@ -1153,6 +1300,7 @@ $(eval $(call BuildPackage,luci-app-openvpn)) $(eval $(call BuildPackage,luci-app-p2pblock)) $(eval $(call BuildPackage,luci-sgi-cgi)) +$(eval $(call BuildPackage,luci-sgi-uhttpd)) $(eval $(call BuildPackage,luci-theme-base)) $(eval $(call BuildPackage,luci-theme-fledermaus)) @@ -1172,3 +1320,8 @@ $(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-i18n-vietnamese)) + +$(eval $(call BuildPackage,luci)) +$(eval $(call BuildPackage,luci-light))