* Changed Makefiles to use mainline Lua

[project/luci.git] / contrib / package / ffluci / Makefile

diff --git a/contrib/package/ffluci/Makefile b/contrib/package/ffluci/Makefile
index a24daf8..bcfe3c2 100644 (file)
--- a/contrib/package/ffluci/Makefile
+++ b/contrib/package/ffluci/Makefile
@@ -5,7 +5,7 @@ PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH)
 PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p')
 
 PKG_NAME:=ffluci
-PKG_VERSION:=0.4+svn$(PKG_REV)
+PKG_VERSION:=0.5+svn$(PKG_REV)
 PKG_RELEASE:=1
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -13,12 +13,10 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 
-PKG_BUILD_DEPENDS:=lua-luci
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-# LUA_TARGET:=compile LUAC=$(BUILD_DIR_HOST)/lua-luci/luac
+# LUA_TARGET:=compile LUAC=$(BUILD_DIR_HOST)/lua/luac
 LUA_TARGET:=source
 
 
@@ -48,7 +46,7 @@ endef
 define Package/ffluci
   $(call Package/ffluci/template)
   MENU:=1
-  DEPENDS:=+lua-luci +luaposix +luci-addons
+  DEPENDS:=+lua +luaposix +luci-addons
 endef
 
 define Package/ffluci/conffiles
@@ -66,9 +64,9 @@ endef
 define Package/ffluci-ff-halle
   $(call Package/ffluci/template)
   DEPENDS:=ffluci \
-   +ffluci-sgi-haserl +ffluci-mod-freifunk +ffluci-app-firewall +ffluci-app-splash \
+   +ffluci-sgi-haserl +ffluci-mod-freifunk +ffluci-app-splash \
    +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
-   +kmod-tun
+   +kmod-tun +ip
   TITLE:=Freifunk Halle Community Meta-Package
 endef
 
@@ -79,9 +77,9 @@ endef
 define Package/ffluci-ff-leipzig
   $(call Package/ffluci/template)
   DEPENDS:=ffluci \
-   +ffluci-sgi-haserl +ffluci-mod-freifunk +ffluci-app-firewall +ffluci-app-splash \
+   +ffluci-sgi-haserl +ffluci-mod-freifunk +ffluci-app-splash \
    +olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice \
-   +kmod-tun
+   +kmod-tun +ip
   TITLE:=Freifunk Leipzig Community Meta-Package
 endef
 
@@ -91,6 +89,21 @@ define Package/ffluci-ff-leipzig/install
 endef
 
 
+define Package/ffluci-ff-hannover
+  $(call Package/ffluci/template)
+  DEPENDS:=ffluci \
+   +ffluci-sgi-haserl +ffluci-mod-freifunk +ffluci-app-splash \
+   +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 <mickey-at-netfreaks-dot-org>
+endef
+
+define Package/ffluci-ff-hannover/install
+       $(call Package/ffluci/install/template,$(1),applications/community-hannover)
+       $(CP) -a ./ipkg/ffluci-ff-hannover.postinst $(1)/CONTROL/postinst
+endef
+
 
 ### Modules ###
 
@@ -107,7 +120,7 @@ endef
 
 define Package/ffluci-mod-freifunk
   $(call Package/ffluci/template)
-  DEPENDS:=ffluci +ffluci-mod-admin-core
+  DEPENDS:=ffluci +ffluci-mod-admin-core +ffluci-app-firewall
   TITLE:=Freifunk public and administrative pages
 endef
 
@@ -117,7 +130,6 @@ endef
 
 define Package/ffluci-mod-freifunk/install
        $(call Package/ffluci/install/template,$(1),modules/freifunk)
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/freifunk/dist/etc/init.d/luci_freifunk $(1)/etc/init.d
 endef
 
 
@@ -142,7 +154,7 @@ endef
 
 define Package/ffluci-app-splash
   $(call Package/ffluci/template)
-  DEPENDS:=ffluci +ffluci-mod-freifunk +ffluci-sgi-haserl +iptables-mod-nat
+  DEPENDS:=ffluci +ffluci-mod-freifunk +ffluci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt
   TITLE:=Freifunk DHCP-Splash application
 endef
 
@@ -154,7 +166,9 @@ define Package/ffluci-app-splash/install
        $(call Package/ffluci/install/template,$(1),applications/luci-splash)
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/sbin/luci-splash $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/init.d/luci_splash $(1)/etc/init.d
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/cron.minutely/luci_splash $(1)/etc/cron.minutely
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi $(1)/usr/lib/luci-splash/htdocs/cgi-bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/www/cgi-bin/luci-splash $(1)/www/cgi-bin/luci-splash
 endef
 
 
@@ -190,6 +204,7 @@ $(eval $(call BuildPackage,ffluci))
 
 $(eval $(call BuildPackage,ffluci-ff-halle))
 $(eval $(call BuildPackage,ffluci-ff-leipzig))
+$(eval $(call BuildPackage,ffluci-ff-hannover))
 
 $(eval $(call BuildPackage,ffluci-mod-admin-core))
 $(eval $(call BuildPackage,ffluci-mod-freifunk))
@@ -198,4 +213,4 @@ $(eval $(call BuildPackage,ffluci-app-firewall))
 $(eval $(call BuildPackage,ffluci-app-splash))
 
 $(eval $(call BuildPackage,ffluci-sgi-haserl))
-$(eval $(call BuildPackage,ffluci-sgi-webuci))
\ No newline at end of file
+$(eval $(call BuildPackage,ffluci-sgi-webuci))