X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=fcfe695664c4fc825fd57630417867380ad70caf;hp=617088750b9681ae31b956e9f35489397b1397e8;hb=3b481cbc79e20852cff62fb50a0788a1500123f0;hpb=cd33db14ba1664f5cd257eed9545f81b6b2d58df diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 617088750..fcfe69566 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -39,31 +39,6 @@ ifeq ($(BOARD),brcm-2.4) endif -include $(INCLUDE_DIR)/package.mk - -ifeq ($(USELOCAL),1) - define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(TAR) c -C ../../../ . \ - --exclude=.pc --exclude=.svn --exclude=.git \ - --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ - --exclude=dist | \ - tar x -C $(PKG_BUILD_DIR)/ - endef -endif - -define Build/Configure -endef - -MAKE_FLAGS += \ - MODULES="$(LUCI_SELECTED_MODULES)" \ - LUA_TARGET="$(LUA_TARGET)" \ - LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ - CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ - LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ - NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" - - ### Templates ### define Package/luci/install/template $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R @@ -103,6 +78,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 +95,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),) @@ -205,9 +183,8 @@ $(eval $(call library,lucid-http,LuCId HTTP Backend,+luci-lib-lucid)) $(eval $(call library,lucid-rpc,LuCId RPC Backend,+luci-lib-lucid)) $(eval $(call library,nixio,NIXIO POSIX library,+PACKAGE_luci-lib-nixio_openssl:libopenssl +PACKAGE_luci-lib-nixio_cyassl:libcyassl)) $(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,+libiwinfo)) +$(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 ### @@ -221,12 +198,12 @@ define Package/luci-mod-freifunk-community TITLE:=Freifunk Community Meta-Package DEPENDS+= \ +luci-lib-web +luci-app-splash \ - +luci-app-ffwizard-leipzig \ + +luci-app-ffwizard \ +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:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr + +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 +luci-app-olsr-services endef define Package/luci-mod-freifunk-community/install @@ -275,7 +252,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)) @@ -308,6 +285,7 @@ endef define Package/luci-app-splash/conffiles /etc/config/luci_splash +/usr/lib/luci-splash/splashtext.html endef define Package/luci-app-statistics/conffiles @@ -319,7 +297,8 @@ define Package/luci-app-diag-devinfo/conffiles 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)) @@ -327,8 +306,17 @@ $(eval $(call application,siitwizard,SIIT IPv4-over-IPv6 configuration wizard,\ $(eval $(call application,firewall,Firmware and Portforwarding application,\ +PACKAGE_luci-app-firewall:firewall)) +$(eval $(call application,freifunk-policyrouting,Policy routing for mesh traffic,\ + +PACKAGE_luci-app-freifunk-policyrouting:freifunk-policyrouting +luci-mod-freifunk)) + $(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,olsr-services,Show services announced with the nameservice plugin,\ + +PACKAGE_luci-app-olsr-services:olsrd-mod-nameservice +luci-mod-freifunk +PACKAGE_luci-app-olsr-services:luci-app-olsr)) $(eval $(call application,qos,Quality of Service configuration module,\ +PACKAGE_luci-app-qos:qos-scripts)) @@ -363,7 +351,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)) @@ -391,15 +378,6 @@ $(eval $(call application,hd-idle,Hard Disk Idle Spin-Down module,\ $(eval $(call application,tinyproxy,Tinyproxy - HTTP(S)-Proxy configuration,\ +luci-mod-admin-full +PACKAGE_luci-app-tinyproxy:tinyproxy)) -$(eval $(call application,initmgr,LuCI Initscript Management,\ - +luci-mod-admin-full)) - -$(eval $(call application,livestats,LuCI Realtime Statistics,\ - +luci-mod-rpc)) - -$(eval $(call application,asterisk,LuCI Support for Asterisk PBX,\ - @BROKEN +PACKAGE_luci-app-asterisk:asterisk14-xip-core)) - $(eval $(call application,polipo,LuCI Support for the Polipo Proxy,\ +PACKAGE_luci-app-polipo:polipo)) @@ -419,6 +397,9 @@ $(eval $(call application,vnstat,LuCI Support for VnStat,\ +PACKAGE_luci-app-vnstat:vnstat \ +PACKAGE_luci-app-vnstat:vnstati)) +$(eval $(call application,radvd,LuCI Support for Radvd,\ + +luci-mod-admin-full +PACKAGE_luci-app-radvd:radvd)) + $(eval $(call application,lqtapifoss,Lantiq voip)) ### Server Gateway Interfaces ### @@ -459,8 +440,8 @@ define theme SUBMENU:=Themes TITLE:=$(if $(2),$(2),LuCI $(1) theme) MAINTAINER:=$(if $(3),$(3),LuCI Development Team ) - DEPENDS:=$(ifneq $(1),base,+luci-theme-base) $(4) - $(if $(5),DEFAULT:=y if PACKAGE_luci-lib-core) + DEPENDS:=$(if $(filter-out base,$(1)),+luci-theme-base) $(4) + $(if $(5),DEFAULT:=PACKAGE_luci-lib-core) endef define Package/luci-theme-$(1)/install @@ -476,7 +457,6 @@ endef $(eval $(call theme,base,Common base for all themes,,+luci-lib-web)) $(eval $(call theme,openwrt,OpenWrt.org (default),,,1)) -$(eval $(call theme,openwrt-light,OpenWrt.org - light variant without images)) $(eval $(call theme,fledermaus,Fledermaus Theme)) $(eval $(call theme,freifunk,alternative Freifunk Theme,\ @@ -488,6 +468,8 @@ $(eval $(call theme,freifunk-bno,Freifunk Berlin Nordost Theme,\ $(eval $(call theme,freifunk-hannover,Freifunk Hannover Theme,\ Mikolas Bingemer )) +$(eval $(call theme,freifunk-generic,Freifunk Generic Theme,\ + Manuel Munz )) ### Translations ### define translation @@ -518,6 +500,7 @@ $(eval $(call translation,french,French (by Florian Fainelli))) $(eval $(call translation,italian,Italian (by Matteo Croce))) $(eval $(call translation,russian,Russian (by Skryabin Dmitry))) $(eval $(call translation,portuguese_brazilian,Portuguese (Brazilian) (by Carlos Cesario))) +$(eval $(call translation,chinese,Chinese (by Chinese Translators))) $(eval $(call translation,japanese,Japanese (by Tsukasa Hamano))) $(eval $(call translation,greek,Greek (by Vasilis Tsiligiannis))) $(eval $(call translation,catalan,Catalan (by Eduard Duran))) @@ -550,23 +533,45 @@ endef $(eval $(call collection,,\ Standard OpenWrt set including full and mini admin and the standard theme,\ - +uhttpd +luci-mod-admin-full +luci-mod-admin-mini +luci-theme-openwrt \ - +luci-app-firewall +luci-app-initmgr)) + +uhttpd +luci-mod-admin-full +luci-theme-openwrt +luci-app-firewall \ + +libiwinfo)) $(eval $(call collection,ssl,\ Standard OpenWrt set with HTTPS support,\ - +uhttpd +uhttpd-mod-tls +px5g +luci-mod-admin-full +luci-mod-admin-mini \ - +luci-theme-openwrt +luci-app-firewall +luci-app-initmgr)) - -$(eval $(call collection,medium,\ - Medium package set using only admin full and a theme without graphics,\ - +uhttpd +luci-mod-admin-full +luci-theme-openwrt-light)) + +uhttpd +uhttpd-mod-tls +px5g +luci-mod-admin-full +luci-theme-openwrt \ + +luci-app-firewall +libiwinfo)) $(eval $(call collection,light,\ - Minimum package set using only admin mini and a theme without graphics,\ - +uhttpd +luci-mod-admin-mini +luci-theme-openwrt-light)) + Minimum package set using only admin mini and the standard theme,\ + +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)) + +include $(INCLUDE_DIR)/package.mk + +ifeq ($(USELOCAL),1) + define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(TAR) c -C ../../../ . \ + --exclude=.pc --exclude=.svn --exclude=.git \ + --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ + --exclude=dist | \ + tar x -C $(PKG_BUILD_DIR)/ + endef +endif + +define Build/Configure +endef + +MAKE_FLAGS += \ + MODULES="$(LUCI_SELECTED_MODULES)" \ + LUA_TARGET="$(LUA_TARGET)" \ + LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ + CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ + NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" + + $(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b))))