X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=0e3b5b582bc76ef417dccafa321aafc616ee050e;hp=d5123aba073c299bd696df4604b0c206f5cb2f60;hb=021a3fcb837b2e6c680e40e96163759c970cfc29;hpb=f9190f89458c5603551007e827a0a13f15fb452f diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index d5123aba0..0e3b5b582 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -10,12 +10,12 @@ PKG_NAME:=luci PKG_RELEASE:=1 ifeq ($(USELOCAL),1) - PKG_VERSION:=0.7+svn + PKG_VERSION:=0.9+svn else - PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH) + PKG_SOURCE_URL:=http://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH) ifeq ($(DUMP),) PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p') - PKG_VERSION:=0.7+svn$(PKG_REV) + PKG_VERSION:=0.9+svn$(PKG_REV) endif PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz @@ -100,11 +100,11 @@ endef define Package/luci-core $(call Package/luci/libtemplate) - DEPENDS:=+lua +luaposix + DEPENDS:=+lua TITLE:=LuCI core libraries endef -define Package/luci-core/install +define Package/luci-core/install $(call Package/luci/install/template,$(1),libs/core) endef @@ -115,7 +115,7 @@ define Package/luci-core/config config PACKAGE_luci-core_compile bool "Precompiled" - + config PACKAGE_luci-core_stripped bool "Stripped" @@ -137,7 +137,7 @@ endif ### Libraries ### define Package/luci-cbi $(call Package/luci/libtemplate) - DEPENDS+=+luci-web + DEPENDS+=+luci-web +luci-uvl +luci-uci TITLE:=Configuration Binding Interface endef @@ -177,9 +177,39 @@ define Package/luci-http/install endef +define Package/luci-ipkg + $(call Package/luci/libtemplate) + TITLE:=LuCI IPKG/OPKG call abstraction library +endef + +define Package/luci-ipkg/install + $(call Package/luci/install/template,$(1),libs/ipkg) +endef + + +define Package/luci-json + $(call Package/luci/libtemplate) + TITLE:=LuCI JSON Library +endef + +define Package/luci-json/install + $(call Package/luci/install/template,$(1),libs/json) +endef + + +define Package/luci-sys + $(call Package/luci/libtemplate) + TITLE:=LuCI Linux/POSIX system library +endef + +define Package/luci-sys/install + $(call Package/luci/install/template,$(1),libs/sys) +endef + + define Package/luci-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-http +luci-addons +luci-uci +luci-sgi-cgi + DEPENDS+=+luci-http +luci-sys +luci-uci +luci-sgi-cgi TITLE:=MVC Webframework endef @@ -192,6 +222,17 @@ define Package/luci-web/install endef +define Package/luci-uvl + $(call Package/luci/libtemplate) + DEPENDS+=+luci-sys +luci-uci +luci-core + TITLE:=UVL - UCI Validation Layer +endef + +define Package/luci-uvl/install + $(call Package/luci/install/template,$(1),libs/uvl) +endef + + ### HTTPD ### @@ -209,83 +250,20 @@ endef ### Community Packages ### -define Package/luci-ff-halle +define Package/luci-freifunk-community $(call Package/luci/fftemplate) DEPENDS+= \ +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ +luci-app-ffwizard-leipzig \ +luci-theme-fledermaus \ +luci-i18n-german \ - +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \ + +olsrd-luci +olsrd-luci-mod-dyn-gw +olsrd-luci-mod-txtinfo +olsrd-luci-mod-nameservice \ +kmod-tun +ip - TITLE:=Freifunk Halle Community Meta-Package -endef - -define Package/luci-ff-halle/install - $(call Package/luci/install/template,$(1),applications/community-halle) -endef - - -define Package/luci-ff-leipzig - $(call Package/luci/fftemplate) - DEPENDS+= \ - +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ - +luci-app-ffwizard-leipzig \ - +luci-theme-fledermaus \ - +luci-i18n-german \ - +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \ - +kmod-tun +ip - TITLE:=Freifunk Leipzig Community Meta-Package -endef - -define Package/luci-ff-leipzig/install - $(call Package/luci/install/template,$(1),applications/community-leipzig) -endef - - -define Package/luci-ff-hannover - $(call Package/luci/fftemplate) - DEPENDS+= \ - +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ - +luci-theme-fledermaus \ - +luci-i18n-german \ - +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice - TITLE:=Freifunk Hannover Community Meta-Package - URL:=http://www.freifunk-hannover.de/ - MAINTAINER:=Mickey Knox -endef - -define Package/luci-ff-hannover/install - $(call Package/luci/install/template,$(1),applications/community-hannover) -endef - - -define Package/luci-ff-berlin - $(call Package/luci/fftemplate) - DEPENDS+= \ - +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ - +luci-theme-fledermaus \ - +luci-i18n-german \ - +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice - TITLE:=Freifunk Berlin Community Meta-Package + TITLE:=Freifunk Community Meta-Package endef -define Package/luci-ff-berlin/install - $(call Package/luci/install/template,$(1),applications/community-berlin) -endef - -define Package/luci-ff-augsburg - $(call Package/luci/fftemplate) - DEPENDS+= \ - +luci-sgi-cgi +luci-app-splash +luci-app-olsr \ - +luci-theme-fledermaus \ - +luci-i18n-german \ - +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice - TITLE:=Freifunk Augsburg Community Meta-Package -endef - -define Package/luci-ff-augsburg/install - $(call Package/luci/install/template,$(1),applications/community-augsburg) +define Package/luci-freifunk-community/install + $(call Package/luci/install/template,$(1),applications/freifunk-community) endef ### Modules ### @@ -296,6 +274,11 @@ 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) endef @@ -304,7 +287,7 @@ endef define Package/luci-admin-mini $(call Package/luci/webtemplate) DEPENDS+=+luci-admin-core - TITLE:=LuCI Essentials - casual user's interface + TITLE:=LuCI Essentials - stripped down and user-friendly endef define Package/luci-admin-mini/install @@ -314,8 +297,8 @@ endef define Package/luci-admin-full $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-core - TITLE:=LuCI Administration - power user's interface + DEPENDS+=+luci-admin-core +luci-ipkg + TITLE:=LuCI Administration - full-featured for full control endef define Package/luci-admin-full/install @@ -323,6 +306,17 @@ define Package/luci-admin-full/install endef +define Package/luci-admin-rpc + $(call Package/luci/webtemplate) + DEPENDS+=+luci-json + TITLE:=LuCI RPC - JSON-RPC API +endef + +define Package/luci-admin-rpc/install + $(call Package/luci/install/template,$(1),modules/rpc) +endef + + define Package/luci-mod-freifunk $(call Package/luci/fftemplate) DEPENDS:=+luci-admin-full @@ -343,7 +337,6 @@ endef define Package/luci-app-ffwizard-leipzig $(call Package/luci/fftemplate) - DEPENDS+=+luci-app-firewall TITLE:=Freifunk Leipzig configuration wizard endef @@ -358,10 +351,6 @@ define Package/luci-app-firewall TITLE:=Firewall and Portforwarding application endef -define Package/luci-app-firewall/conffiles -/etc/config/luci_fw -endef - define Package/luci-app-firewall/install $(call Package/luci/install/template,$(1),applications/luci-fw) endef @@ -369,7 +358,7 @@ endef define Package/luci-app-olsr $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +olsrd-mod-txtinfo + DEPENDS+=+luci-admin-full +olsrd-luci +olsrd-luci-mod-txtinfo TITLE:=OLSR configuration and status module endef @@ -391,7 +380,7 @@ endef define Package/luci-app-splash $(call Package/luci/fftemplate) - DEPENDS+=+luasocket +iptables-mod-nat +iptables-mod-ipopt + DEPENDS+=+luasocket TITLE:=Freifunk DHCP-Splash application endef @@ -452,6 +441,80 @@ define Package/luci-app-ddns/install endef +define Package/luci-app-samba + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +samba3 + TITLE:=Network Shares - Samba SMB/CIFS module +endef + +define Package/luci-app-samba/install + $(call Package/luci/install/template,$(1),applications/luci-samba) +endef + + +define Package/luci-app-uvc_streamer + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +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-p910nd + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +p910nd + TITLE:=p910nd - Printer server module +endef + +define Package/luci-app-p910nd/install + $(call Package/luci/install/template,$(1),applications/luci-p910nd) +endef + + +define Package/luci-app-ushare + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +ushare + TITLE:=ushare - UPnP A/V & DLNA Media Server +endef + +define Package/luci-app-ushare/install + $(call Package/luci/install/template,$(1),applications/luci-ushare) +endef + +define Package/luci-app-hd_idle + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +hd-idle + TITLE:=hd-idle +endef + +define Package/luci-app-hd_idle/install + $(call Package/luci/install/template,$(1),applications/luci-hd_idle) +endef + +define Package/luci-app-tinyproxy + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +tinyproxy + TITLE:=Tinyproxy - HTTP(S)-Proxy +endef + +define Package/luci-app-tinyproxy/install + $(call Package/luci/install/template,$(1),applications/luci-tinyproxy) +endef + +define Package/luci-app-initmgr + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full + TITLE:=LuCI Initscript Management +endef + +define Package/luci-app-initmgr/install + $(call Package/luci/install/template,$(1),applications/luci-initmgr) +endef + + ### Server Gateway Interfaces ### define Package/luci-sgi-cgi @@ -493,6 +556,28 @@ define Package/luci-theme-fledermaus/install $(call Package/luci/install/template,$(1),themes/fledermaus) endef +define Package/luci-theme-freifunk + $(call Package/luci/thtemplate) + DEPENDS:=+luci-web + MAINTAINER:=Stefan Pirwitz + TITLE:=alternative Freifunk Theme +endef + +define Package/luci-theme-freifunk/install + $(call Package/luci/install/template,$(1),themes/freifunk) +endef + +define Package/luci-theme-freifunk-bno + $(call Package/luci/thtemplate) + DEPENDS:=+luci-web + MAINTAINER:=Stefan Pirwitz + TITLE:=Freifunk Berlin Nordost Theme +endef + +define Package/luci-theme-freifunk-bno/install + $(call Package/luci/install/template,$(1),themes/freifunk-bno) +endef + define Package/luci-theme-openwrt $(call Package/luci/thtemplate) TITLE:=OpenWRT.org (default) @@ -502,6 +587,16 @@ define Package/luci-theme-openwrt/install $(call Package/luci/install/template,$(1),themes/openwrt.org) endef +define Package/luci-theme-openwrtlight + $(call Package/luci/thtemplate) + TITLE:=OpenWRT.org - light variant without images +endef + +define Package/luci-theme-openwrtlight/install + $(call Package/luci/install/template,$(1),themes/openwrt-light) +endef + + ### Translations ### define Package/luci-i18n-german $(call Package/luci/i18ntemplate) @@ -525,7 +620,7 @@ endef define Package/luci-i18n-french $(call Package/luci/i18ntemplate) - TITLE:=French + TITLE:=French (by Florian Fainelli) endef define Package/luci-i18n-french/install @@ -533,6 +628,24 @@ define Package/luci-i18n-french/install endef +define Package/luci-i18n-russian + $(call Package/luci/i18ntemplate) + TITLE:=Russian (by Skryabin Dmitry) +endef + +define Package/luci-i18n-russian/install + $(call Package/luci/install/template,$(1),i18n/russian) +endef + + +define Package/luci-i18n-portuguese_brazilian + $(call Package/luci/i18ntemplate) + TITLE:=Portuguese (Brazilian) (by Carlos Cesario) +endef + +define Package/luci-i18n-portuguese_brazilian/install + $(call Package/luci/install/template,$(1),i18n/portuguese_brazilian) +endef ### Compile ### @@ -548,33 +661,29 @@ endif ifneq ($(CONFIG_PACKAGE_luci-http),) PKG_SELECTED_MODULES+=libs/http endif +ifneq ($(CONFIG_PACKAGE_luci-ipkg),) + PKG_SELECTED_MODULES+=libs/ipkg +endif +ifneq ($(CONFIG_PACKAGE_luci-json),) + PKG_SELECTED_MODULES+=libs/json +endif ifneq ($(CONFIG_PACKAGE_luci-uci),) PKG_SELECTED_MODULES+=libs/uci endif +ifneq ($(CONFIG_PACKAGE_luci-sys),) + PKG_SELECTED_MODULES+=libs/sys +endif ifneq ($(CONFIG_PACKAGE_luci-web),) PKG_SELECTED_MODULES+=libs/web endif +ifneq ($(CONFIG_PACKAGE_luci-uvl),) + PKG_SELECTED_MODULES+=libs/uvl +endif ifneq ($(CONFIG_PACKAGE_luci-httpd),) PKG_SELECTED_MODULES+=libs/httpd endif -ifneq ($(CONFIG_PACKAGE_luci-ff-halle),) - PKG_SELECTED_MODULES+=applications/community-halle -endif -ifneq ($(CONFIG_PACKAGE_luci-ff-leipzig),) - PKG_SELECTED_MODULES+=applications/community-leipzig -endif -ifneq ($(CONFIG_PACKAGE_luci-ff-hannover),) - PKG_SELECTED_MODULES+=applications/community-hannover -endif -ifneq ($(CONFIG_PACKAGE_luci-ff-berlin),) - PKG_SELECTED_MODULES+=applications/community-berlin -endif -ifneq ($(CONFIG_PACKAGE_luci-ff-augsburg),) - PKG_SELECTED_MODULES+=applications/community-augsburg -endif - ifneq ($(CONFIG_PACKAGE_luci-admin-core),) PKG_SELECTED_MODULES+=modules/admin-core endif @@ -584,10 +693,17 @@ endif ifneq ($(CONFIG_PACKAGE_luci-admin-full),) PKG_SELECTED_MODULES+=modules/admin-full endif +ifneq ($(CONFIG_PACKAGE_luci-admin-rpc),) + PKG_SELECTED_MODULES+=modules/rpc +endif ifneq ($(CONFIG_PACKAGE_luci-mod-freifunk),) PKG_SELECTED_MODULES+=modules/freifunk endif +ifneq ($(CONFIG_PACKAGE_luci-freifunk-community),) + PKG_SELECTED_MODULES+=applications/freifunk-community +endif + ifneq ($(CONFIG_PACKAGE_luci-app-ffwizard-leipzig),) PKG_SELECTED_MODULES+=applications/luci-ffwizard-leipzig endif @@ -615,6 +731,28 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-ddns),) PKG_SELECTED_MODULES+=applications/luci-ddns 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-p910nd),) + PKG_SELECTED_MODULES+=applications/luci-p910nd +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 +endif +ifneq ($(CONFIG_PACKAGE_luci-app-tinyproxy),) + PKG_SELECTED_MODULES+=applications/luci-tinyproxy +endif +ifneq ($(CONFIG_PACKAGE_luci-app-initmgr),) + PKG_SELECTED_MODULES+=applications/luci-initmgr +endif + ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),) PKG_SELECTED_MODULES+=libs/sgi-cgi @@ -629,9 +767,18 @@ endif ifneq ($(CONFIG_PACKAGE_luci-theme-fledermaus),) PKG_SELECTED_MODULES+=themes/fledermaus endif +ifneq ($(CONFIG_PACKAGE_luci-theme-freifunk-bno),) + PKG_SELECTED_MODULES+=themes/freifunk-bno +endif +ifneq ($(CONFIG_PACKAGE_luci-theme-freifunk),) + PKG_SELECTED_MODULES+=themes/freifunk +endif ifneq ($(CONFIG_PACKAGE_luci-theme-openwrt),) PKG_SELECTED_MODULES+=themes/openwrt.org endif +ifneq ($(CONFIG_PACKAGE_luci-theme-openwrtlight),) + PKG_SELECTED_MODULES+=themes/openwrt-light +endif ifneq ($(CONFIG_PACKAGE_luci-i18n-german),) PKG_SELECTED_MODULES+=i18n/german @@ -642,6 +789,12 @@ endif ifneq ($(CONFIG_PACKAGE_luci-i18n-french),) PKG_SELECTED_MODULES+=i18n/french endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-russian),) + PKG_SELECTED_MODULES+=i18n/russian +endif +ifneq ($(CONFIG_PACKAGE_luci-i18n-portuguese_brazilian),) + PKG_SELECTED_MODULES+=i18n/portuguese_brazilian +endif MAKE_FLAGS += \ @@ -657,22 +810,23 @@ $(eval $(call BuildPackage,luci-core)) $(eval $(call BuildPackage,luci-cbi)) $(eval $(call BuildPackage,luci-fastindex)) $(eval $(call BuildPackage,luci-http)) +$(eval $(call BuildPackage,luci-ipkg)) +$(eval $(call BuildPackage,luci-json)) $(eval $(call BuildPackage,luci-uci)) +$(eval $(call BuildPackage,luci-sys)) $(eval $(call BuildPackage,luci-web)) +$(eval $(call BuildPackage,luci-uvl)) $(eval $(call BuildPackage,luci-httpd)) -$(eval $(call BuildPackage,luci-ff-halle)) -$(eval $(call BuildPackage,luci-ff-leipzig)) -$(eval $(call BuildPackage,luci-ff-hannover)) -$(eval $(call BuildPackage,luci-ff-berlin)) -$(eval $(call BuildPackage,luci-ff-augsburg)) - $(eval $(call BuildPackage,luci-admin-core)) $(eval $(call BuildPackage,luci-admin-mini)) $(eval $(call BuildPackage,luci-admin-full)) +$(eval $(call BuildPackage,luci-admin-rpc)) $(eval $(call BuildPackage,luci-mod-freifunk)) +$(eval $(call BuildPackage,luci-freifunk-community)) + $(eval $(call BuildPackage,luci-app-ffwizard-leipzig)) $(eval $(call BuildPackage,luci-app-firewall)) $(eval $(call BuildPackage,luci-app-olsr)) @@ -682,14 +836,26 @@ $(eval $(call BuildPackage,luci-app-statistics)) $(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-p910nd)) +$(eval $(call BuildPackage,luci-app-ushare)) +$(eval $(call BuildPackage,luci-app-hd_idle)) +$(eval $(call BuildPackage,luci-app-tinyproxy)) +$(eval $(call BuildPackage,luci-app-initmgr)) $(eval $(call BuildPackage,luci-sgi-cgi)) $(eval $(call BuildPackage,luci-sgi-luci)) $(eval $(call BuildPackage,luci-sgi-webuci)) $(eval $(call BuildPackage,luci-theme-fledermaus)) +$(eval $(call BuildPackage,luci-theme-freifunk)) +$(eval $(call BuildPackage,luci-theme-freifunk-bno)) $(eval $(call BuildPackage,luci-theme-openwrt)) +$(eval $(call BuildPackage,luci-theme-openwrtlight)) $(eval $(call BuildPackage,luci-i18n-german)) $(eval $(call BuildPackage,luci-i18n-english)) $(eval $(call BuildPackage,luci-i18n-french)) +$(eval $(call BuildPackage,luci-i18n-russian)) +$(eval $(call BuildPackage,luci-i18n-portuguese_brazilian))