X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=87f38c7893480911b88aff23c06e80034eecfa6f;hp=60f119060db5e2d7156ff338ee8894b394b4e81a;hb=08fc73b8a6bb87c4094188fb60ebaed88c82d4c7;hpb=dc00b42e6da0765e6fd213e50230d4765569f9ac diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 60f119060..87f38c789 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -67,7 +67,7 @@ endef define Package/luci/httpdtemplate $(call Package/luci/libtemplate) - SUBMENU:=LuCI Non-Forking HTTP-Daemon (EXPERIMENTAL) + SUBMENU:=LuCIttpd DEPENDS:=+luci-httpd endef @@ -238,12 +238,12 @@ endef define Package/luci-httpd $(call Package/luci/httpdtemplate) - DEPENDS:=+luci-http +luasocket + DEPENDS:=+luci-http +libuci TITLE:=Server Core endef define Package/luci-httpd/install - $(call Package/luci/install/template,$(1),libs/httpd) + $(call Package/luci/install/template,$(1),libs/lucittpd) endef @@ -297,7 +297,7 @@ endef define Package/luci-admin-full $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core +luci-ipkg + DEPENDS+=+luci-admin-core +luci-ipkg +luci-app-firewall TITLE:=LuCI Administration - full-featured for full control endef @@ -345,6 +345,16 @@ define Package/luci-app-ffwizard-leipzig/install endef +define Package/luci-app-siitwizard + $(call Package/luci/fftemplate) + TITLE:=SIIT IPv4-over-IPv6 configuration wizard +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 @@ -463,6 +473,17 @@ define Package/luci-app-uvc_streamer/install endef +define Package/luci-app-mmc_over_gpio + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +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) +endef + + define Package/luci-app-p910nd $(call Package/luci/webtemplate) DEPENDS+=+luci-admin-full +p910nd @@ -516,8 +537,8 @@ 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 @@ -533,6 +554,26 @@ 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 +endef + +define Package/luci-app-polipo/install + $(call Package/luci/install/template,$(1),applications/luci-polipo) +endef + +define Package/luci-app-openvpn + $(call Package/luci/webtemplate) + TITLE:=LuCI Support for OpenVPN + DEPENDS+=@BROKEN +luci-admin-core +openvpn +endef + +define Package/luci-app-openvpn/install + $(call Package/luci/install/template,$(1),applications/luci-openvpn) +endef + ### Server Gateway Interfaces ### @@ -548,7 +589,7 @@ endef define Package/luci-sgi-luci $(call Package/luci/libtemplate) DEPENDS+=+luci-httpd - TITLE:=SGI for LuCI HTTPD + TITLE:=SGI for LuCIttpd endef define Package/luci-sgi-luci/install @@ -712,7 +753,7 @@ ifneq ($(CONFIG_PACKAGE_luci-uvl),) endif ifneq ($(CONFIG_PACKAGE_luci-httpd),) - PKG_SELECTED_MODULES+=libs/httpd + PKG_SELECTED_MODULES+=libs/lucittpd endif ifneq ($(CONFIG_PACKAGE_luci-admin-core),) @@ -738,6 +779,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 @@ -768,6 +812,9 @@ 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 +endif ifneq ($(CONFIG_PACKAGE_luci-app-p910nd),) PKG_SELECTED_MODULES+=applications/luci-p910nd endif @@ -789,6 +836,12 @@ 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-sgi-cgi),) @@ -840,7 +893,7 @@ endif MAKE_FLAGS += \ MODULES="$(PKG_SELECTED_MODULES)" \ LUA_TARGET="$(LUA_TARGET)" \ - LUA_SHLIBS="-llua -lm" \ + LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ OS="Linux" @@ -868,6 +921,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)) @@ -878,6 +932,7 @@ $(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-p910nd)) $(eval $(call BuildPackage,luci-app-ushare)) $(eval $(call BuildPackage,luci-app-hd_idle)) @@ -885,6 +940,8 @@ $(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-sgi-cgi)) $(eval $(call BuildPackage,luci-sgi-luci))