X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Folsrd-luci%2FMakefile;h=766bb606b342bf4327a11c95a759c0f1ee9d04a0;hp=642f0839d43451fb264d44d259ebc14492751e07;hb=66736c857476550c68720a4cf933ab2f6d04031d;hpb=88bb3caa5cb4ae88709996d2eca038eadc465dd3

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index 642f0839d..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)+hg1785
-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:=0935688fa0fb5b0e073fe53ec654c5b2
-#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_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>
@@ -51,84 +53,72 @@ 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)
-	MENU:=1
 	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