X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=6229646c80752b13270a7e044ca1095942b9140d;hp=6f4f6980e751515650856de598b29411e9b5aa98;hb=7af6503b1e70b5f6d80db7433904bc6baefb08a3;hpb=ea1374c96cd248d340ea083f5685c4efde7ca9c3 diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 6f4f6980e..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 @@ -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 @@ -236,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 @@ -249,12 +275,12 @@ endef -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 @@ -264,14 +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)" config PACKAGE_luci-nixio_cyassl bool "CyaSSL" - select PACKAGE_libcyassl-luci + select PACKAGE_libcyassl config PACKAGE_luci-nixio_openssl bool "OpenSSL" @@ -279,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 @@ -290,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 @@ -303,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 @@ -312,9 +346,10 @@ endef define Package/luci-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-http +luci-sys +luci-uci +luci-lucid +luci-sgi-cgi +luci-lmo + 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 @@ -343,7 +378,7 @@ 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 \ @@ -365,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 @@ -504,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 @@ -527,7 +567,13 @@ endef 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 @@ -539,7 +585,8 @@ 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 @@ -607,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 @@ -650,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 @@ -735,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 @@ -930,6 +977,39 @@ define Package/luci-i18n-spanish/install 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 @@ -958,6 +1038,9 @@ 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 @@ -989,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 @@ -1045,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 @@ -1057,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 @@ -1086,6 +1169,9 @@ 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 @@ -1145,6 +1231,9 @@ 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 += \ @@ -1165,6 +1254,7 @@ $(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)) @@ -1176,6 +1266,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)) @@ -1196,11 +1287,10 @@ $(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)) @@ -1210,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)) @@ -1230,3 +1321,7 @@ $(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))