X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=45039a1c73bce9afe56b5330429b995695c5d2c9;hp=86a6fef6528863f435b1c0c7f929eb2e5a5ad4b4;hb=03ad47080cc869051af58f91769da4faf503e151;hpb=ced440f886cead1ae33eb1021c34131c20221dfd diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 86a6fef65..45039a1c7 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -103,6 +103,9 @@ define Package/luci-lib-core/config config PACKAGE_luci-lib-core_stripped bool "Stripped" + config PACKAGE_luci-lib-core_srcdiet + bool "Compressed Source" + config PACKAGE_luci-lib-core_source bool "Full Source" @@ -117,8 +120,8 @@ ifneq ($(CONFIG_PACKAGE_luci-lib-core_stripped),) LUA_TARGET:=strip endif -ifneq ($(CONFIG_PACKAGE_luci-lib-core_zipped),) - LUA_TARGET:=gzip +ifneq ($(CONFIG_PACKAGE_luci-lib-core_srcdiet),) + LUA_TARGET:=diet endif ifneq ($(CONFIG_PACKAGE_luci-lib-core),) @@ -207,7 +210,6 @@ $(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl: $(eval $(call library,px5g,RSA/X.509 Key Generator (required for LuCId SSL support),+luci-lib-nixio)) $(eval $(call library,sys,LuCI Linux/POSIX system library)) $(eval $(call library,web,MVC Webframework,+luci-lib-sys +luci-lib-nixio +luci-lib-core +luci-sgi-cgi +luci-lib-lmo)) -$(eval $(call library,uvl,UVL - UCI Validation Layer,+luci-lib-sys +luci-lib-core)) ### Community Packages ### @@ -223,9 +225,9 @@ define Package/luci-mod-freifunk-community +luci-lib-web +luci-app-splash \ +luci-app-ffwizard-leipzig \ +luci-i18n-german \ - +PACKAGE_luci-mod-freifunk-community:olsrd-luci +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-dyn-gw-plain \ - +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-nameservice \ - +PACKAGE_luci-mod-freifunk-community:olsrd-luci-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \ + +PACKAGE_luci-mod-freifunk-community:olsrd +PACKAGE_luci-mod-freifunk-community:olsrd-mod-dyn-gw-plain \ + +PACKAGE_luci-mod-freifunk-community:olsrd-mod-txtinfo +PACKAGE_luci-mod-freifunk-community:olsrd-mod-nameservice \ + +PACKAGE_luci-mod-freifunk-community:olsrd-mod-watchdog +PACKAGE_luci-mod-freifunk-community:kmod-tun \ +PACKAGE_luci-mod-freifunk-community:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr endef @@ -275,7 +277,7 @@ define Package/luci-mod-freifunk/conffiles endef $(eval $(call module,admin-core,Web UI Core module,+luci-lib-web +luci-i18n-english)) -$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core)) +$(eval $(call module,admin-mini,LuCI Essentials - stripped down and user-friendly,+luci-mod-admin-core @BROKEN)) $(eval $(call module,admin-full,LuCI Administration - full-featured for full control,+luci-mod-admin-core +luci-lib-ipkg)) $(eval $(call module,rpc,LuCI RPC - JSON-RPC API,+luci-lib-json)) $(eval $(call module,freifunk,LuCI Freifunk module,+luci-mod-admin-full +luci-lib-json +PACKAGE_luci-mod-freifunk:freifunk-firewall)) @@ -322,6 +324,9 @@ endef $(eval $(call application,ffwizard-leipzig,Freifunk Leipzig configuration wizard)) +$(eval $(call application,ffwizard,Freifunk configuration wizard,\ + +luci-mod-freifunk)) + $(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,\ +PACKAGE_luci-app-siitwizard:kmod-siit)) @@ -329,7 +334,10 @@ $(eval $(call application,firewall,Firmware and Portforwarding application,\ +PACKAGE_luci-app-firewall:firewall)) $(eval $(call application,olsr,OLSR configuration and status module,\ - +luci-mod-admin-full +PACKAGE_luci-app-olsr:olsrd-luci +PACKAGE_luci-app-olsr:olsrd-luci-mod-txtinfo)) + +luci-mod-admin-full +PACKAGE_luci-app-olsr:olsrd +PACKAGE_luci-app-olsr:olsrd-mod-txtinfo)) + +$(eval $(call application,olsr-viz,OLSR Visualisation,\ + +PACKAGE_luci-app-olsr-viz:luci-app-olsr +PACKAGE_luci-app-olsr-viz:olsrd-mod-txtinfo)) $(eval $(call application,qos,Quality of Service configuration module,\ +PACKAGE_luci-app-qos:qos-scripts)) @@ -364,7 +372,6 @@ $(eval $(call application,voice-core,LuCI Voice Software (Core))) $(eval $(call application,voice-diag,LuCI Voice Software (Diagnostics),\ +luci-app-voice-core +luci-app-diag-devinfo)) - $(eval $(call application,upnp,Universal Plug & Play configuration module,\ +PACKAGE_luci-app-upnp:miniupnpd)) @@ -550,18 +557,18 @@ endef $(eval $(call collection,,\ Standard OpenWrt set including full and mini admin and the standard theme,\ +uhttpd +luci-mod-admin-full +luci-theme-openwrt +luci-app-firewall \ - +luci-app-initmgr)) + +luci-app-initmgr +libiwinfo)) $(eval $(call collection,ssl,\ Standard OpenWrt set with HTTPS support,\ +uhttpd +uhttpd-mod-tls +px5g +luci-mod-admin-full +luci-theme-openwrt \ - +luci-app-firewall +luci-app-initmgr)) + +luci-app-firewall +luci-app-initmgr +libiwinfo)) $(eval $(call collection,light,\ Minimum package set using only admin mini and the standard theme,\ - +uhttpd +luci-mod-admin-mini +luci-theme-openwrt)) + +uhttpd +luci-mod-admin-mini +luci-theme-openwrt @BROKEN)) ### Compile ### -PKG_CONFIG_DEPENDS := $(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES)) +PKG_CONFIG_DEPENDS=$(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES)) $(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b))))