X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=5595db8f90bb81133ba7a879f7f471877d6a9a8b;hb=3484ece05ece2e3997f763cf679f82df16609f13;hp=cf6e71e631280449af17a28b88432cb99b4dcc37;hpb=37ac71b816b395e4ed9a16b02fa04eafea81a6a9;p=project%2Fluci.git diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index cf6e71e63..5595db8f9 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -12,12 +12,12 @@ PKG_RELEASE:=1 PKG_BUILD_PARALLEL:=0 ifeq ($(USELOCAL),1) - PKG_VERSION:=0.10+svn + PKG_VERSION:=trunk+svn else PKG_SOURCE_URL:=http://svn.luci.subsignal.org/luci/$(PKG_BRANCH) ifeq ($(DUMP),) PKG_REV:=$(shell LC_ALL=C svn info $(CURDIR) | sed -ne's/^Revision: //p') - PKG_VERSION:=0.10+svn$(PKG_REV) + PKG_VERSION:=trunk+svn$(PKG_REV) endif PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz @@ -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),) @@ -207,7 +185,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 ### @@ -220,13 +197,12 @@ define Package/luci-mod-freifunk-community SUBMENU:=Freifunk TITLE:=Freifunk Community Meta-Package DEPENDS+= \ - +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:ip +PACKAGE_luci-mod-freifunk-community:freifunk-watchdog +luci-app-olsr + +luci-lib-web +luci-app-splash +luci-i18n-german \ + +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 +freifunk-gwcheck +freifunk-mapupdate endef define Package/luci-mod-freifunk-community/install @@ -275,7 +251,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)) @@ -320,7 +296,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)) @@ -328,8 +305,20 @@ $(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,meshwizard, Shellscript based wizard to setup mesh networks,\ + +meshwizard +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)) @@ -364,7 +353,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)) @@ -392,12 +380,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,polipo,LuCI Support for the Polipo Proxy,\ +PACKAGE_luci-app-polipo:polipo)) @@ -420,6 +402,9 @@ $(eval $(call application,vnstat,LuCI Support for VnStat,\ $(eval $(call application,radvd,LuCI Support for Radvd,\ +luci-mod-admin-full +PACKAGE_luci-app-radvd:radvd)) +$(eval $(call application,ahcp,LuCI Support for AHCPd,\ + +luci-mod-admin-full +PACKAGE_luci-app-ahcp:ahcpd)) + $(eval $(call application,lqtapifoss,Lantiq voip)) ### Server Gateway Interfaces ### @@ -520,6 +505,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))) @@ -528,6 +514,7 @@ $(eval $(call translation,spanish,Spanish (by Guillermo Javier Nardoni))) $(eval $(call translation,vietnamese,Vietnamese (by Hong Phuc Dang))) $(eval $(call translation,malay,Malay (by Teow Wai Chet))) $(eval $(call translation,norwegian,Norwegian (by Lars Hardy))) +$(eval $(call translation,hebrew,Hebrew)) ### Collections ### @@ -553,18 +540,44 @@ 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)) + +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 +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)) + +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))))