X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Folsrd-luci%2FMakefile;h=766bb606b342bf4327a11c95a759c0f1ee9d04a0;hb=2f34a51f830cf0cf98d4da1813ffed83984b2bcd;hp=bcc50d729acd3893f2bd9338cf1ac1232ae5ac3d;hpb=6fef46408b6d86ebb873b92b48261ddf71f1d43d;p=project%2Fluci.git

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index bcc50d729..766bb606b 100644
--- a/contrib/package/olsrd-luci/Makefile
+++ b/contrib/package/olsrd-luci/Makefile
@@ -11,29 +11,31 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASENAME:=olsrd
 PKG_NAME:=$(PKG_BASENAME)-luci
-PKG_BASEVER:=0.5.6-r3
-PKG_VERSION:=$(PKG_BASEVER)+freifunk
-PKG_RELEASE:=1
+PKG_BASEVER:=0.5.6-r7
+PKG_RELEASE:=2
 
-#PKG_HGREV:=a7316f987848
+#PKG_HGREV:=438bd63a1ab8
 #PKG_SOURCE:=$(PKG_HGREV).tar.gz
-#PKG_SOURCE_URL:=http://gredler.at/hg/olsrd/archive
-#PKG_MD5SUM:=b228b5452af158cd4313f9ed416d9c84
+#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:=0935688fa0fb5b0e073fe53ec654c5b2
+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>
@@ -51,81 +53,83 @@ 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-quagga
 	$(call Package/olsrd-luci/common_info)
-	MENU:=1
 	TITLE:=OLSR - Quagga Plugin
 	DEPENDS:=olsrd-luci
 endef
 
+define Package/olsrd-luci-mod-watchdog
+	$(call Package/olsrd-luci/common_info)
+	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
+
 TARGET_CFLAGS += $(FPIC)
 
 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" \
@@ -134,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 quagga"
+		SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice secure txtinfo quagga watchdog mdns"
 endef
 
 define Package/olsrd-luci/install
@@ -196,6 +200,16 @@ define Package/olsrd-luci-mod-quagga/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/quagga/olsrd_quagga.so.* $(1)/usr/lib/
 endef
 
+define Package/olsrd-luci-mod-watchdog/install
+	$(INSTALL_DIR) $(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
+
 
 $(eval $(call BuildPackage,olsrd-luci))
 $(eval $(call BuildPackage,olsrd-luci-mod-arprefresh))
@@ -208,3 +222,5 @@ $(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-quagga))
+$(eval $(call BuildPackage,olsrd-luci-mod-watchdog))
+$(eval $(call BuildPackage,olsrd-luci-mod-mdns))