Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* 3rd Package reorgnaisation

Browse source 
* Moved core, web, cbi to libs
* Refactored OpenWRT Makefile to separate Libraries, Webinterface Components, Freifunk packages
This commit is contained in:
Steven Barth 2008-05-27 09:33:52 +00:00
parent 30c8b259e1
commit 93ff578ac8
52 changed files with 76 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
contrib/package/luci/Makefile
View file

@ -30,35 +30,65 @@ define Build/Compile
endef endef
define Package/luci/template ### Templates ###
define Package/luci/libtemplate
SECTION:=admin SECTION:=admin
CATEGORY:=Administration CATEGORY:=Administration
TITLE:=LuCI - Lua Configuration Interface TITLE:=LuCI - Lua Configuration Interface
URL:=http://luci.freifunk-halle.net/ URL:=http://luci.freifunk-halle.net/
MAINTAINER:=Steven Barth <steven-at-midlink-dot-org> MAINTAINER:=Steven Barth <steven-at-midlink-dot-org>
SUBMENU:=LuCI - Libraries
DEPENDS:=+luci-core
endef endef
define Package/luci/fftemplate
$(call Package/luci/libtemplate)
SUBMENU:=LuCI - Freifunk Support
DEPENDS:=+luci-mod-freifunk
endef
define Package/luci/webtemplate
$(call Package/luci/libtemplate)
SUBMENU:=LuCI - Webinterface Components
endef
define Package/luci/install/template define Package/luci/install/template
$(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R $(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
endef endef
define Package/luci
$(call Package/luci/template) ### Core package ###
MENU:=1
define Package/luci-core
$(call Package/luci/libtemplate)
DEPENDS:=+lua +luaposix DEPENDS:=+lua +luaposix
TITLE:=LuCI core libraries
endef endef
define Package/luci/install define Package/luci-core/install
$(call Package/luci/install/template,$(1),core) $(call Package/luci/install/template,$(1),libs/core)
endef
### Libraries ###
define Package/luci-cbi
$(call Package/luci/libtemplate)
DEPENDS+=+luci-web
TITLE:=Configuration Binding Interface
endef
define Package/luci-cbi/install
$(call Package/luci/install/template,$(1),libs/cbi)
endef endef
### Web Packages ###
define Package/luci-web define Package/luci-web
$(call Package/luci/template) $(call Package/luci/libtemplate)
DEPENDS:=luci +luci-addons DEPENDS+=+luci-addons
TITLE:=LuCI - Webframework TITLE:=MVC Webframework
endef endef
define Package/luci-web/conffiles define Package/luci-web/conffiles
@ -66,7 +96,7 @@ define Package/luci-web/conffiles
endef endef
define Package/luci-web/install define Package/luci-web/install
$(call Package/luci/install/template,$(1),web) $(call Package/luci/install/template,$(1),libs/web)
$(call Package/luci/install/template,$(1),themes/fledermaus) $(call Package/luci/install/template,$(1),themes/fledermaus)
endef endef
@ -75,9 +105,9 @@ endef
### Community Packages ### ### Community Packages ###
define Package/luci-ff-halle define Package/luci-ff-halle
$(call Package/luci/template) $(call Package/luci/fftemplate)
DEPENDS:=luci \ DEPENDS+= \
+luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \ +luci-sgi-haserl +luci-app-splash \
+luci-app-ffwizard-leipzig \ +luci-app-ffwizard-leipzig \
+olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \ +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
+kmod-tun +ip +kmod-tun +ip
@ -89,9 +119,9 @@ endef
define Package/luci-ff-leipzig define Package/luci-ff-leipzig
$(call Package/luci/template) $(call Package/luci/fftemplate)
DEPENDS:=luci \ DEPENDS+= \
+luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \ +luci-sgi-haserl +luci-app-splash \
+luci-app-ffwizard-leipzig \ +luci-app-ffwizard-leipzig \
+olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \ +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
+kmod-tun +ip +kmod-tun +ip
@ -105,9 +135,9 @@ endef
define Package/luci-ff-hannover define Package/luci-ff-hannover
$(call Package/luci/template) $(call Package/luci/fftemplate)
DEPENDS:=luci \ DEPENDS+= \
+luci-sgi-haserl +luci-mod-freifunk +luci-app-splash \ +luci-sgi-haserl +luci-app-splash \
+olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice
TITLE:=Freifunk Hannover Community Meta-Package TITLE:=Freifunk Hannover Community Meta-Package
URL:=http://www.freifunk-hannover.de/ URL:=http://www.freifunk-hannover.de/
@ -123,9 +153,9 @@ endef
### Modules ### ### Modules ###
define Package/luci-mod-admin-core define Package/luci-mod-admin-core
$(call Package/luci/template) $(call Package/luci/webtemplate)
DEPENDS:=luci +luci-web +luci-app-cbi DEPENDS+=+luci-web +luci-cbi
TITLE:=Core administrative pages TITLE:=Administration module
endef endef
define Package/luci-mod-admin-core/install define Package/luci-mod-admin-core/install
@ -134,9 +164,9 @@ endef
define Package/luci-mod-freifunk define Package/luci-mod-freifunk
$(call Package/luci/template) $(call Package/luci/fftemplate)
DEPENDS:=luci +luci-mod-admin-core +luci-app-firewall DEPENDS:=+luci-mod-admin-core
TITLE:=Freifunk public and administrative pages TITLE:=LuCI Freifunk module
endef endef
define Package/luci-mod-freifunk/conffiles define Package/luci-mod-freifunk/conffiles
@ -151,20 +181,9 @@ endef
### Applications ### ### Applications ###
define Package/luci-app-cbi
$(call Package/luci/template)
DEPENDS:=luci +luci-web
TITLE:=Configuration Binding Interface
endef
define Package/luci-app-cbi/install
$(call Package/luci/install/template,$(1),applications/cbi)
endef
define Package/luci-app-ffwizard-leipzig define Package/luci-app-ffwizard-leipzig
$(call Package/luci/template) $(call Package/luci/fftemplate)
DEPENDS:=luci +luci-mod-freifunk DEPENDS+=+luci-app-firewall
TITLE:=Freifunk Leipzig configuration wizard TITLE:=Freifunk Leipzig configuration wizard
endef endef
@ -174,8 +193,8 @@ endef
define Package/luci-app-firewall define Package/luci-app-firewall
$(call Package/luci/template) $(call Package/luci/webtemplate)
DEPENDS:=luci +luci-mod-admin-core DEPENDS+=+luci-mod-admin-core
TITLE:=Firewall and Portforwarding application TITLE:=Firewall and Portforwarding application
endef endef
@ -190,8 +209,8 @@ endef
define Package/luci-app-splash define Package/luci-app-splash
$(call Package/luci/template) $(call Package/luci/fftemplate)
DEPENDS:=luci +luci-mod-freifunk +luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt DEPENDS+=+luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt
TITLE:=Freifunk DHCP-Splash application TITLE:=Freifunk DHCP-Splash application
endef endef
@ -210,8 +229,8 @@ endef
define Package/luci-app-statistics define Package/luci-app-statistics
$(call Package/luci/template) $(call Package/luci/webtemplate)
DEPENDS:=luci +luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1 DEPENDS+=+luci-mod-admin-core +collectd +collectd-mod-rrdtool1 +rrdtool1
TITLE:=LuCI Statistics Application (incomplete) TITLE:=LuCI Statistics Application (incomplete)
endef endef
@ -229,31 +248,32 @@ endef
### Server Gateway Interfaces ### ### Server Gateway Interfaces ###
define Package/luci-sgi-haserl define Package/luci-sgi-haserl
$(call Package/luci/template) $(call Package/luci/libtemplate)
DEPENDS:=luci +luci-web +haserl-lua DEPENDS+=+luci-web +haserl-lua
TITLE:=SGI for Haserl TITLE:=SGI for Haserl
endef endef
define Package/luci-sgi-haserl/install define Package/luci-sgi-haserl/install
$(call Package/luci/install/template,$(1),applications/sgi-haserl) $(call Package/luci/install/template,$(1),libs/sgi-haserl)
$(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst $(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst
endef endef
define Package/luci-sgi-webuci define Package/luci-sgi-webuci
$(call Package/luci/template) $(call Package/luci/libtemplate)
DEPENDS:=luci +luci-web DEPENDS+=+luci-web
TITLE:=SGI for Webuci TITLE:=SGI for Webuci
endef endef
define Package/luci-sgi-webuci/install define Package/luci-sgi-webuci/install
$(call Package/luci/install/template,$(1),applications/sgi-webuci) $(call Package/luci/install/template,$(1),libs/sgi-webuci)
endef endef
$(eval $(call BuildPackage,luci)) $(eval $(call BuildPackage,luci-core))
$(eval $(call BuildPackage,luci-cbi))
$(eval $(call BuildPackage,luci-web)) $(eval $(call BuildPackage,luci-web))
$(eval $(call BuildPackage,luci-ff-halle)) $(eval $(call BuildPackage,luci-ff-halle))
@ -263,7 +283,6 @@ $(eval $(call BuildPackage,luci-ff-hannover))
$(eval $(call BuildPackage,luci-mod-admin-core)) $(eval $(call BuildPackage,luci-mod-admin-core))
$(eval $(call BuildPackage,luci-mod-freifunk)) $(eval $(call BuildPackage,luci-mod-freifunk))
$(eval $(call BuildPackage,luci-app-cbi))
$(eval $(call BuildPackage,luci-app-ffwizard-leipzig)) $(eval $(call BuildPackage,luci-app-ffwizard-leipzig))
$(eval $(call BuildPackage,luci-app-firewall)) $(eval $(call BuildPackage,luci-app-firewall))
$(eval $(call BuildPackage,luci-app-splash)) $(eval $(call BuildPackage,luci-app-splash))

2
core/Makefile
View file

@ -1,2 +0,0 @@
include ../build/config.mk
include ../build/module.mk

0
applications/cbi/Makefile → libs/cbi/Makefile
View file

0
applications/cbi/root/www/resources/cbi.js → libs/cbi/root/www/resources/cbi.js
View file

0
applications/cbi/src/cbi.lua → libs/cbi/src/cbi.lua
View file

0
applications/cbi/src/view/cbi/dvalue.htm → libs/cbi/src/view/cbi/dvalue.htm
View file

0
applications/cbi/src/view/cbi/footer.htm → libs/cbi/src/view/cbi/footer.htm
View file

0
applications/cbi/src/view/cbi/full_valuefooter.htm → libs/cbi/src/view/cbi/full_valuefooter.htm
View file

0
applications/cbi/src/view/cbi/full_valueheader.htm → libs/cbi/src/view/cbi/full_valueheader.htm
View file

0
applications/cbi/src/view/cbi/fvalue.htm → libs/cbi/src/view/cbi/fvalue.htm
View file

0
applications/cbi/src/view/cbi/header.htm → libs/cbi/src/view/cbi/header.htm
View file

0
applications/cbi/src/view/cbi/lvalue.htm → libs/cbi/src/view/cbi/lvalue.htm
View file

0
applications/cbi/src/view/cbi/map.htm → libs/cbi/src/view/cbi/map.htm
View file

0
applications/cbi/src/view/cbi/mvalue.htm → libs/cbi/src/view/cbi/mvalue.htm
View file

0
applications/cbi/src/view/cbi/nsection.htm → libs/cbi/src/view/cbi/nsection.htm
View file

0
applications/cbi/src/view/cbi/tblsection.htm → libs/cbi/src/view/cbi/tblsection.htm
View file

0
applications/cbi/src/view/cbi/tiny_valuefooter.htm → libs/cbi/src/view/cbi/tiny_valuefooter.htm
View file

0
applications/cbi/src/view/cbi/tiny_valueheader.htm → libs/cbi/src/view/cbi/tiny_valueheader.htm
View file

0
applications/cbi/src/view/cbi/tsection.htm → libs/cbi/src/view/cbi/tsection.htm
View file

0
applications/cbi/src/view/cbi/ucisection.htm → libs/cbi/src/view/cbi/ucisection.htm
View file

0
applications/cbi/src/view/cbi/value.htm → libs/cbi/src/view/cbi/value.htm
View file

0
applications/cbi/src/view/cbi/valuefooter.htm → libs/cbi/src/view/cbi/valuefooter.htm
View file

0
applications/cbi/src/view/cbi/valueheader.htm → libs/cbi/src/view/cbi/valueheader.htm
View file

2
libs/core/Makefile Normal file
View file

@ -0,0 +1,2 @@
include ../../build/config.mk
include ../../build/module.mk

0
core/src/bits.lua → libs/core/src/bits.lua
View file

0
core/src/debug.lua → libs/core/src/debug.lua
View file

0
core/src/fs.lua → libs/core/src/fs.lua
View file

0
core/src/init.lua → libs/core/src/init.lua
View file

0
core/src/model/ipkg.lua → libs/core/src/model/ipkg.lua
View file

0
core/src/model/uci.lua → libs/core/src/model/uci.lua
View file

0
core/src/model/uci/libuci.lua → libs/core/src/model/uci/libuci.lua
View file

0
core/src/model/uci/wrapper.lua → libs/core/src/model/uci/wrapper.lua
View file

0
core/src/sys.lua → libs/core/src/sys.lua
View file

0
core/src/sys/iptparser.lua → libs/core/src/sys/iptparser.lua
View file

0
core/src/util.lua → libs/core/src/util.lua
View file

0
applications/sgi-haserl/Makefile → libs/sgi-haserl/Makefile
View file

0
applications/sgi-haserl/root/www/cgi-bin/index.cgi → libs/sgi-haserl/root/www/cgi-bin/index.cgi
View file

0
applications/sgi-haserl/root/www/cgi-bin/luci → libs/sgi-haserl/root/www/cgi-bin/luci
View file

0
applications/sgi-haserl/root/www/cgi-bin/luci-upload → libs/sgi-haserl/root/www/cgi-bin/luci-upload
View file

0
applications/sgi-haserl/root/www/index.html → libs/sgi-haserl/root/www/index.html
View file

0
applications/sgi-haserl/src/sgi/haserl.lua → libs/sgi-haserl/src/sgi/haserl.lua
View file

0
applications/sgi-webuci/Makefile → libs/sgi-webuci/Makefile
View file

0
applications/sgi-webuci/root/lib/webuci/main.lua → libs/sgi-webuci/root/lib/webuci/main.lua
View file

0
applications/sgi-webuci/src/sgi/webuci.lua → libs/sgi-webuci/src/sgi/webuci.lua
View file

2
libs/web/Makefile Normal file
View file

@ -0,0 +1,2 @@
include ../../build/config.mk
include ../../build/module.mk

0
web/root/etc/config/luci → libs/web/root/etc/config/luci
View file

0
web/src/config.lua → libs/web/src/config.lua
View file

0
web/src/dispatcher.lua → libs/web/src/dispatcher.lua
View file

0
web/src/http.lua → libs/web/src/http.lua
View file

0
web/src/i18n.lua → libs/web/src/i18n.lua
View file

0
web/src/template.lua → libs/web/src/template.lua
View file

2
web/Makefile
View file

@ -1,2 +0,0 @@
include ../build/config.mk
include ../build/module.mk