X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=c3ee83f940c3956f5d340d140dbe622c97fc74a3;hb=1c8dffdffe1981f32e5df7e87c02b0423b6db6cc;hp=99ce88fb403eff4f0a2437babcd1d17b7298ba24;hpb=af418dfc1b459ee944b67cb8dcfa9a78c573e682;p=project%2Fluci.git diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 99ce88fb4..c3ee83f94 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -275,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 @@ -290,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" @@ -305,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 @@ -339,7 +346,8 @@ 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,auto,Default Language) endef @@ -370,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 \ @@ -392,11 +400,6 @@ 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 @@ -558,32 +561,32 @@ endef define Package/luci-app-diag-core $(call Package/luci/webtemplate) - DEPENDS+=+PACKAGE_luci-app-diag-core:luci-admin-core + 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 \ + 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 \ - +PACAKGE_luci-app-diag-devinfo:netdiscover-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+=+PACKAGE_luci-app-voice-core:luci-admin-core + 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-apps-voice-diag:luci-app-diag-devinfo + +PACKAGE_luci-app-voice-diag:luci-app-diag-devinfo TITLE:=LuCI Voice Software (Diagnostics) endef @@ -651,25 +654,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 @@ -694,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 @@ -787,10 +779,21 @@ define Package/luci-sgi-cgi/install $(call Package/luci/install/template,$(1),libs/sgi-cgi) endef +define Package/luci-sgi-uhttpd + $(call Package/luci/libtemplate) + 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 @@ -985,18 +988,41 @@ endef ### Collections ### -define Package/luci-kamikaze +define Package/luci + $(call Package/luci/collectiontemplate) + TITLE:=Standard OpenWrt set including full and mini admin and the standard theme + DEPENDS:=+uhttpd +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-ssl $(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 + TITLE:=Standard OpenWrt set with https support + DEPENDS:=+uhttpd +uhttpd-mod-tls +px5g +luci-admin-full +luci-admin-mini \ + +luci-theme-openwrt +luci-app-firewall +luci-app-initmgr endef +define Package/luci-ssl/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 + DEPENDS:=+uhttpd +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 @@ -1118,11 +1144,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 @@ -1130,8 +1153,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 @@ -1159,6 +1182,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 @@ -1274,11 +1300,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)) @@ -1288,6 +1313,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)) @@ -1310,5 +1336,6 @@ $(eval $(call BuildPackage,luci-i18n-portuguese)) $(eval $(call BuildPackage,luci-i18n-spanish)) $(eval $(call BuildPackage,luci-i18n-vietnamese)) -$(eval $(call BuildPackage,luci-kamikaze)) +$(eval $(call BuildPackage,luci)) +$(eval $(call BuildPackage,luci-ssl)) $(eval $(call BuildPackage,luci-light))