X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Fluci%2FMakefile;h=9ae6f57bbbf174af50f91edd9d70b3ffc97824c5;hb=bb2def39406667f68ef1270623329986384938f4;hp=d2fceedc91419b89882c4428851b91f8c5640168;hpb=9d0c00590d2e232d66588567da2048fc64ef940a;p=project%2Fluci.git diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index d2fceedc9..9ae6f57bb 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -1,6 +1,6 @@ include $(TOPDIR)/rules.mk -PKG_BRANCH:=trunk +PKG_BRANCH:=tags/0.8.1 ifeq ($(DUMP),) USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1) @@ -10,12 +10,12 @@ PKG_NAME:=luci PKG_RELEASE:=1 ifeq ($(USELOCAL),1) - PKG_VERSION:=0.7+svn + PKG_VERSION:=0.8+svn else - PKG_SOURCE_URL:=http://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH) + PKG_SOURCE_URL:=http://svn.luci.subsignal.org/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_REV:=HEAD + PKG_VERSION:=0.8.1 endif PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz @@ -59,18 +59,6 @@ define Package/luci/libtemplate DEPENDS:=+luci-core endef -define Package/luci/fftemplate - $(call Package/luci/libtemplate) - SUBMENU:=LuCI Freifunk Support (PARTLY BROKEN) - DEPENDS:=+luci-mod-freifunk @BROKEN -endef - -define Package/luci/httpdtemplate - $(call Package/luci/libtemplate) - SUBMENU:=LuCI Non-Forking HTTP-Daemon (EXPERIMENTAL) - DEPENDS:=+luci-httpd -endef - define Package/luci/i18ntemplate $(call Package/luci/libtemplate) SUBMENU:=LuCI Translations @@ -100,9 +88,8 @@ endef define Package/luci-core $(call Package/luci/libtemplate) - DEPENDS:=+lua +luaposix +bitlib + DEPENDS:=+lua TITLE:=LuCI core libraries - SUBMENU:=!!! DISABLE Libraries -> libuci-lua !!! IT WILL BREAK LUCI !!! endef define Package/luci-core/install @@ -149,14 +136,12 @@ endef define Package/luci-uci $(call Package/luci/libtemplate) - DEPENDS+=+libuci @!PACKAGE_libuci-lua + DEPENDS+=+libuci-lua TITLE:=High-Level UCI API endef define Package/luci-uci/install $(call Package/luci/install/template,$(1),libs/uci) - $(INSTALL_DIR) $(1)/usr/lib/lua - $(CP) $(PKG_BUILD_DIR)/contrib/uci/dist/usr/lib/lua/uci.so $(1)/usr/lib/lua endef @@ -212,7 +197,7 @@ endef define Package/luci-web $(call Package/luci/libtemplate) - DEPENDS+=+luci-http +luci-sys +luci-addons +luci-uci +luci-sgi-cgi + DEPENDS+=+luci-http +luci-sys +luci-uci +luci-sgi-cgi TITLE:=MVC Webframework endef @@ -236,102 +221,6 @@ define Package/luci-uvl/install endef - -### HTTPD ### - -define Package/luci-httpd - $(call Package/luci/httpdtemplate) - DEPENDS:=+luci-http +luasocket - TITLE:=Server Core -endef - -define Package/luci-httpd/install - $(call Package/luci/install/template,$(1),libs/httpd) -endef - - - -### Community Packages ### - -define Package/luci-ff-halle - $(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 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 -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) -endef - ### Modules ### define Package/luci-admin-core @@ -340,6 +229,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 @@ -348,7 +242,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 @@ -359,7 +253,7 @@ endef define Package/luci-admin-full $(call Package/luci/webtemplate) DEPENDS+=+luci-admin-core +luci-ipkg - TITLE:=LuCI Administration - power user's interface + TITLE:=LuCI Administration - full-featured for full control endef define Package/luci-admin-full/install @@ -378,34 +272,8 @@ define Package/luci-admin-rpc/install endef -define Package/luci-mod-freifunk - $(call Package/luci/fftemplate) - DEPENDS:=+luci-admin-full - TITLE:=LuCI Freifunk module -endef - -define Package/luci-mod-freifunk/conffiles -/etc/config/freifunk -endef - -define Package/luci-mod-freifunk/install - $(call Package/luci/install/template,$(1),modules/freifunk) -endef - - - ### Applications ### -define Package/luci-app-ffwizard-leipzig - $(call Package/luci/fftemplate) - TITLE:=Freifunk Leipzig configuration wizard -endef - -define Package/luci-app-ffwizard-leipzig/install - $(call Package/luci/install/template,$(1),applications/luci-ffwizard-leipzig) -endef - - define Package/luci-app-firewall $(call Package/luci/webtemplate) DEPENDS+=+luci-admin-core @@ -419,7 +287,7 @@ endef define Package/luci-app-olsr $(call Package/luci/webtemplate) - DEPENDS+=+luci-admin-full +olsrd +olsrd-mod-txtinfo + DEPENDS+=+luci-admin-full +olsrd-luci +olsrd-luci-mod-txtinfo TITLE:=OLSR configuration and status module endef @@ -439,21 +307,6 @@ define Package/luci-app-qos/install endef -define Package/luci-app-splash - $(call Package/luci/fftemplate) - DEPENDS+=+luasocket - TITLE:=Freifunk DHCP-Splash application -endef - -define Package/luci-app-splash/conffiles -/etc/config/luci_splash -endef - -define Package/luci-app-splash/install - $(call Package/luci/install/template,$(1),applications/luci-splash) -endef - - define Package/luci-app-statistics $(call Package/luci/webtemplate) DEPENDS+=+luci-admin-full +collectd +collectd-mod-rrdtool1 +rrdtool1 @@ -513,50 +366,106 @@ define Package/luci-app-samba/install endef -### Server Gateway Interfaces ### +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-sgi-cgi - $(call Package/luci/libtemplate) - TITLE:=SGI for CGI +define Package/luci-app-uvc_streamer/install + $(call Package/luci/install/template,$(1),applications/luci-uvc_streamer) endef -define Package/luci-sgi-cgi/install - $(call Package/luci/install/template,$(1),libs/sgi-cgi) + +define Package/luci-app-p910nd + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +p910nd + TITLE:=p910nd - Printer server module endef -define Package/luci-sgi-luci - $(call Package/luci/libtemplate) - DEPENDS+=+luci-httpd - TITLE:=SGI for LuCI HTTPD +define Package/luci-app-p910nd/install + $(call Package/luci/install/template,$(1),applications/luci-p910nd) endef -define Package/luci-sgi-luci/install - $(call Package/luci/install/template,$(1),libs/sgi-luci) + +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-sgi-webuci - $(call Package/luci/libtemplate) - TITLE:=SGI for Webuci +define Package/luci-app-ushare/install + $(call Package/luci/install/template,$(1),applications/luci-ushare) endef -define Package/luci-sgi-webuci/install - $(call Package/luci/install/template,$(1),libs/sgi-webuci) +define Package/luci-app-hd_idle + $(call Package/luci/webtemplate) + DEPENDS+=+luci-admin-full +hd-idle + TITLE:=hd-idle endef -### Themes ### -define Package/luci-theme-fledermaus - $(call Package/luci/fftemplate) - DEPENDS:=+luci-web - TITLE:=Fledermaus Theme +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-theme-fledermaus/install - $(call Package/luci/install/template,$(1),themes/fledermaus) +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 + +#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 + + +### Server Gateway Interfaces ### + +define Package/luci-sgi-cgi + $(call Package/luci/libtemplate) + TITLE:=SGI for CGI +endef + +define Package/luci-sgi-cgi/install + $(call Package/luci/install/template,$(1),libs/sgi-cgi) endef + +### Themes ### +#define Package/luci-theme-base +# $(call Package/luci/thtemplate) +# DEPENDS:=+luci-web +# TITLE:=Common base for all themes +#endef +# +#define Package/luci-theme-base/install +# $(call Package/luci/install/template,$(1),themes/base) +#endef + define Package/luci-theme-openwrt $(call Package/luci/thtemplate) - TITLE:=OpenWRT.org (default) + TITLE:=OpenWrt.org (default) +# DEPENDS:=+luci-theme-base endef define Package/luci-theme-openwrt/install @@ -565,7 +474,8 @@ endef define Package/luci-theme-openwrtlight $(call Package/luci/thtemplate) - TITLE:=OpenWRT.org - light variant without images + TITLE:=OpenWrt.org - light variant without images +# DEPENDS:=+luci-theme-base endef define Package/luci-theme-openwrtlight/install @@ -614,6 +524,16 @@ define Package/luci-i18n-russian/install 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 ### ifneq ($(CONFIG_PACKAGE_luci-core),) @@ -635,7 +555,7 @@ ifneq ($(CONFIG_PACKAGE_luci-json),) PKG_SELECTED_MODULES+=libs/json endif ifneq ($(CONFIG_PACKAGE_luci-uci),) - PKG_SELECTED_MODULES+=libs/uci contrib/uci + PKG_SELECTED_MODULES+=libs/uci endif ifneq ($(CONFIG_PACKAGE_luci-sys),) PKG_SELECTED_MODULES+=libs/sys @@ -647,26 +567,6 @@ 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 @@ -679,13 +579,7 @@ 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-app-ffwizard-leipzig),) - PKG_SELECTED_MODULES+=applications/luci-ffwizard-leipzig -endif ifneq ($(CONFIG_PACKAGE_luci-app-firewall),) PKG_SELECTED_MODULES+=applications/luci-fw endif @@ -695,9 +589,6 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-qos),) PKG_SELECTED_MODULES+=applications/luci-qos endif -ifneq ($(CONFIG_PACKAGE_luci-app-splash),) - PKG_SELECTED_MODULES+=applications/luci-splash -endif ifneq ($(CONFIG_PACKAGE_luci-app-statistics),) PKG_SELECTED_MODULES+=applications/luci-statistics endif @@ -713,21 +604,37 @@ 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-app-polipo),) +# PKG_SELECTED_MODULES+=applications/luci-polipo +#endif ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),) PKG_SELECTED_MODULES+=libs/sgi-cgi endif -ifneq ($(CONFIG_PACKAGE_luci-sgi-luci),) - PKG_SELECTED_MODULES+=libs/sgi-luci -endif -ifneq ($(CONFIG_PACKAGE_luci-sgi-webuci),) - PKG_SELECTED_MODULES+=libs/sgi-webuci -endif -ifneq ($(CONFIG_PACKAGE_luci-theme-fledermaus),) - PKG_SELECTED_MODULES+=themes/fledermaus -endif + +#ifneq ($(CONFIG_PACKAGE_luci-theme-base),) +# PKG_SELECTED_MODULES+=themes/base +#endif ifneq ($(CONFIG_PACKAGE_luci-theme-openwrt),) PKG_SELECTED_MODULES+=themes/openwrt.org endif @@ -747,6 +654,9 @@ 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 += \ @@ -769,36 +679,30 @@ $(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-app-ffwizard-leipzig)) $(eval $(call BuildPackage,luci-app-firewall)) $(eval $(call BuildPackage,luci-app-olsr)) $(eval $(call BuildPackage,luci-app-qos)) -$(eval $(call BuildPackage,luci-app-splash)) $(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-app-polipo)) $(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-base)) $(eval $(call BuildPackage,luci-theme-openwrt)) $(eval $(call BuildPackage,luci-theme-openwrtlight)) @@ -806,3 +710,4 @@ $(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))