projects / project / luci.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
contrib: make remove dependency to custom olsrd
[project/luci.git] / contrib / package / olsrd-luci / Makefile
diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index 85f55b2..766bb60 100644 (file)
--- a/contrib/package/olsrd-luci/Makefile
+++ b/contrib/package/olsrd-luci/Makefile
@@ -11,28 +11,31 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASENAME:=olsrd
 PKG_NAME:=$(PKG_BASENAME)-luci
-PKG_VERSION:=0.5.6-r3+hg2227
-PKG_RELEASE:=1
-
-PKG_HGREV:=a7316f987848
-PKG_SOURCE:=$(PKG_HGREV).tar.gz
-PKG_SOURCE_URL:=http://gredler.at/hg/olsrd/archive
-PKG_MD5SUM:=b228b5452af158cd4313f9ed416d9c84
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_HGREV)
-PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
-
-#PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_VERSION).tar.bz2
-#PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
-#PKG_MD5SUM:=0935688fa0fb5b0e073fe53ec654c5b2
-#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-#PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
+PKG_BASEVER:=0.5.6-r7
+PKG_RELEASE:=2
+
+#PKG_HGREV:=438bd63a1ab8
+#PKG_SOURCE:=$(PKG_HGREV).tar.gz
+#PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
+#PKG_MD5SUM:=18cfb6afd823daa29dee8375223201d2
+#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_HGREV)
+#PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+#PKG_VERSION:=$(PKG_BASEVER)+$(PKG_HGREV)+luci1
+
+PKG_SOURCE:=$(PKG_BASENAME)-$(PKG_BASEVER).tar.bz2
+PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
+PKG_MD5SUM:=dde8cb45a10f0cad2010ab2e8ad55146
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_BASEVER)
+PKG_UNPACK=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
+PKG_VERSION:=$(PKG_BASEVER)+luci1
 
 include $(INCLUDE_DIR)/package.mk
 
 
 define Package/olsrd-luci/common_info
-       SECTION:=net
-       CATEGORY:=Network
+       SECTION:=luci
+       CATEGORY:=LuCI
+       SUBMENU:=Freifunk
        TITLE:=OLSR - Optimized Link State Routing Daemon
        URL:=http://www.olsr.org/
        MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
@@ -50,78 +53,73 @@ endef
 
 define Package/olsrd-luci-mod-arprefresh
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - ARP Refresh Plugin
        DEPENDS:=olsrd-luci
 endef
 
 define Package/olsrd-luci-mod-dot-draw
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - Dot Draw Plugin
        DEPENDS:=olsrd-luci
 endef
 
 define Package/olsrd-luci-mod-bmf
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - Basic Multicast Forwarding Plugin
        DEPENDS:=olsrd-luci +kmod-tun
 endef
 
 define Package/olsrd-luci-mod-dyn-gw
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - Dynamic Gateway Plugin
        DEPENDS:=olsrd-luci
 endef
 
 define Package/olsrd-luci-mod-dyn-gw-plain
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - Dynamic Gateway Plugin (Plain Version)
        DEPENDS:=olsrd-luci
 endef
 
 define Package/olsrd-luci-mod-httpinfo
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - HTTP/HTML Info Plugin
        DEPENDS:=olsrd-luci
 endef
 
 define Package/olsrd-luci-mod-nameservice
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - Hostname Propagation Plugin
        DEPENDS:=olsrd-luci
 endef
 
 define Package/olsrd-luci-mod-secure
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - Security Extensions Plugin
        DEPENDS:=olsrd-luci
 endef
 
 define Package/olsrd-luci-mod-txtinfo
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
        TITLE:=OLSR - HTTP/Plaintext Info Plugin
        DEPENDS:=olsrd-luci
 endef
 
-define Package/olsrd-luci-mod-pgraph
+define Package/olsrd-luci-mod-quagga
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
-       TITLE:=OLSR - PGraph Plugin
+       TITLE:=OLSR - Quagga Plugin
        DEPENDS:=olsrd-luci
 endef
 
-define Package/olsrd-luci-mod-quagga
+define Package/olsrd-luci-mod-watchdog
        $(call Package/olsrd-luci/common_info)
-       MENU:=1
-       TITLE:=OLSR - Quagga Plugin
+       TITLE:=OLSR - Watchdog Plugin
+       DEPENDS:=olsrd-luci
+endef
+
+define Package/olsrd-luci-mod-mdns
+       $(call Package/olsrd-luci/common_info)
+       TITLE:=OLSR - mDNS Plugin
        DEPENDS:=olsrd-luci
 endef
 
@@ -131,7 +129,7 @@ define Build/Compile
        $(MAKE) -C "$(PKG_BUILD_DIR)" olsrd libs \
                $(TARGET_CONFIGURE_OPTS) \
                NODEBUG=1 \
-               CFLAGS="$(TARGET_CFLAGS)" \
+               CFLAGS="$(TARGET_CFLAGS) -DSVEN_OLA_UNBLOAT -DNODEBUG" \
                OS="linux" \
                INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
                LIBDIR="$(PKG_INSTALL_DIR)/usr/lib" \
@@ -140,7 +138,7 @@ define Build/Compile
                MANDIR="$(PKG_INSTALL_DIR)/usr/share/man" \
                STRIP="true" \
                INSTALL_LIB="true" \
-               SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice secure txtinfo pgraph quagga"
+               SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice secure txtinfo quagga watchdog mdns"
 endef
 
 define Package/olsrd-luci/install
@@ -197,14 +195,19 @@ define Package/olsrd-luci-mod-txtinfo/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/txtinfo/olsrd_txtinfo.so.* $(1)/usr/lib/
 endef
 
-define Package/olsrd-luci-mod-pgraph/install
+define Package/olsrd-luci-mod-quagga/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/pgraph/olsrd_pgraph.so.* $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/quagga/olsrd_quagga.so.* $(1)/usr/lib/
 endef
 
-define Package/olsrd-luci-mod-quagga/install
+define Package/olsrd-luci-mod-watchdog/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/quagga/olsrd_quagga.so.* $(1)/usr/lib/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/watchdog/olsrd_watchdog.so.* $(1)/usr/lib/
+endef
+
+define Package/olsrd-luci-mod-mdns/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/mdns/olsrd_mdns.so.* $(1)/usr/lib/
 endef
 
 
@@ -218,5 +221,6 @@ $(eval $(call BuildPackage,olsrd-luci-mod-httpinfo))
 $(eval $(call BuildPackage,olsrd-luci-mod-nameservice))
 $(eval $(call BuildPackage,olsrd-luci-mod-secure))
 $(eval $(call BuildPackage,olsrd-luci-mod-txtinfo))
-$(eval $(call BuildPackage,olsrd-luci-mod-pgraph))
 $(eval $(call BuildPackage,olsrd-luci-mod-quagga))
+$(eval $(call BuildPackage,olsrd-luci-mod-watchdog))
+$(eval $(call BuildPackage,olsrd-luci-mod-mdns))
Lua Configuration Interface (mirror)