X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Folsrd-luci%2FMakefile;h=1baab9de7e485d6871f47730f919bcc10cbf6a3f;hp=de85d8ab578af29e0c20449cbc69c3764004c065;hb=3df2864e13ace1719cbe8cd81b18849e3a90c54e;hpb=6bd1476aee2b52c8db935244e893cead310455bd

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index de85d8ab5..1baab9de7 100644
--- a/contrib/package/olsrd-luci/Makefile
+++ b/contrib/package/olsrd-luci/Makefile
@@ -11,19 +11,22 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASENAME:=olsrd
 PKG_NAME:=$(PKG_BASENAME)-luci
-PKG_VERSION:=0.5.6-r3+hg2131
-PKG_RELEASE:=2
-
-PKG_HGREV:=26d021f68c49
-PKG_SOURCE:=$(PKG_HGREV).tar.gz
-PKG_SOURCE_URL:=http://gredler.at/hg/olsrd/archive
-PKG_MD5SUM:=db07cbbdff1c97ff4045cd4f5716be2e
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_HGREV)
-
-#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_BASENAME)-$(PKG_VERSION)
+PKG_BASEVER:=0.5.6-r4
+PKG_VERSION:=$(PKG_BASEVER)+luci1
+PKG_RELEASE:=1
+
+#PKG_HGREV:=54e88033741d
+#PKG_SOURCE:=$(PKG_HGREV).tar.gz
+#PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
+#PKG_MD5SUM:=e195860d25f152245d6d92257c31304d
+#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_BASEVER).tar.bz2
+PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5
+PKG_MD5SUM:=16076660413bcf625ba8772fdb3d607f
+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)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,7 +36,7 @@ define Package/olsrd-luci/common_info
 	CATEGORY:=Network
 	TITLE:=OLSR - Optimized Link State Routing Daemon
 	URL:=http://www.olsr.org/
-	MAINTAINER:=Jo-Philipp Wich <xm@leipzig.freifunk.net>
+	MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
 endef
 
 define Package/olsrd-luci
@@ -109,17 +112,24 @@ define Package/olsrd-luci-mod-txtinfo
 	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)
+	MENU:=1
+	TITLE:=OLSR - mDNS Plugin
 	DEPENDS:=olsrd-luci
 endef
 
@@ -129,7 +139,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" \
@@ -138,7 +148,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
@@ -195,14 +205,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
 
 
@@ -216,5 +231,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))