X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=a5ba53013ba30a561e76f5f45099d20fa71e05cd;hb=23052d8f013188302dd9faee47f6911e4ed0e1e1;hp=b5904e807729c3e2a62747a9dcd7c5cd7645b1c9;hpb=d13eeb17e82237b3436b49656da45c77ebd852d6;p=project%2Fluci.git diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index b5904e807..a5ba53013 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 @@ -59,10 +60,15 @@ define Package/luci/libtemplate TITLE:=LuCI - Lua Configuration Interface URL:=http://luci.freifunk-halle.net/ MAINTAINER:=Steven Barth - 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 @@ -81,11 +87,21 @@ define Package/luci/thtemplate 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 @@ -215,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 @@ -226,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,7 +280,7 @@ NIXIO_TLS:=axtls define Package/luci-nixio $(call Package/luci/libtemplate) TITLE:=NIXIO POSIX Library - DEPENDS:= + DEPENDS:=+PACKAGE_luci-nixio_openssl:libopenssl +PACKAGE_luci-nixio_cyassl:libcyassl endef define Package/luci-nixio/install @@ -261,7 +297,7 @@ define Package/luci-nixio/config config PACKAGE_luci-nixio_cyassl bool "CyaSSL" - select PACKAGE_libcyassl-luci + select PACKAGE_libcyassl config PACKAGE_luci-nixio_openssl bool "OpenSSL" @@ -280,8 +316,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 @@ -293,6 +329,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 @@ -302,9 +339,9 @@ 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-uci +luci-lucid +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 @@ -355,17 +392,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 @@ -494,7 +536,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 @@ -509,6 +551,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) @@ -554,25 +646,14 @@ define Package/luci-app-samba/install endef -define Package/luci-app-uvc_streamer - $(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 +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 @@ -597,14 +678,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 @@ -682,8 +763,8 @@ 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 @@ -747,7 +828,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 @@ -866,6 +948,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 @@ -888,9 +1013,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 @@ -922,6 +1053,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 @@ -954,6 +1088,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 @@ -966,11 +1112,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 @@ -978,8 +1121,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 @@ -1063,6 +1206,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 += \ @@ -1081,7 +1230,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)) @@ -1093,6 +1244,7 @@ $(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)) @@ -1105,15 +1257,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)) @@ -1142,3 +1297,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))