X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=contrib%2Fpackage%2Folsrd-luci%2FMakefile;h=bcc50d729acd3893f2bd9338cf1ac1232ae5ac3d;hb=22827dbef4dfcb5655c12e92ddb441893ed8b3c7;hp=8e22a7448f0e3fd41040af965b81cc27ca02c67d;hpb=3f8ce1ad107c2248d0810b2e0140079c2156c74a;p=project%2Fluci.git

diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile
index 8e22a7448..bcc50d729 100644
--- a/contrib/package/olsrd-luci/Makefile
+++ b/contrib/package/olsrd-luci/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 Freifunk Leipzig
+# Copyright (C) 2008-2009 Freifunk Leipzig
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,19 +11,22 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASENAME:=olsrd
 PKG_NAME:=$(PKG_BASENAME)-luci
-PKG_VERSION:=0.5.6-r2+hg1724
+PKG_BASEVER:=0.5.6-r3
+PKG_VERSION:=$(PKG_BASEVER)+freifunk
 PKG_RELEASE:=1
 
-PKG_HGREV:=cac1df64dcd5
-PKG_SOURCE:=$(PKG_HGREV).tar.gz
-PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive
-PKG_MD5SUM:=95af2d8d6075f74d379b752fb8dda3de
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-0-5-6-$(PKG_HGREV)
+#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:=64b439cde30f48764f02cdd8766aba40
-#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_BASENAME)-$(PKG_VERSION)
+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)
 
 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,13 +112,6 @@ define Package/olsrd-luci-mod-txtinfo
 	DEPENDS:=olsrd-luci
 endef
 
-define Package/olsrd-luci-mod-pgraph
-	$(call Package/olsrd-luci/common_info)
-	MENU:=1
-	TITLE:=OLSR - PGraph Plugin
-	DEPENDS:=olsrd-luci
-endef
-
 define Package/olsrd-luci-mod-quagga
 	$(call Package/olsrd-luci/common_info)
 	MENU:=1
@@ -123,13 +119,6 @@ define Package/olsrd-luci-mod-quagga
 	DEPENDS:=olsrd-luci
 endef
 
-define Package/olsrd-luci-mod-tas
-	$(call Package/olsrd-luci/common_info)
-	MENU:=1
-	TITLE:=OLSR - Tiny Application Server Plugin
-	DEPENDS:=olsrd-luci
-endef
-
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
@@ -145,7 +134,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 tas"
+		SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo nameservice secure txtinfo quagga"
 endef
 
 define Package/olsrd-luci/install
@@ -202,21 +191,11 @@ 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
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/pgraph/olsrd_pgraph.so.* $(1)/usr/lib/
-endef
-
 define Package/olsrd-luci-mod-quagga/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/quagga/olsrd_quagga.so.* $(1)/usr/lib/
 endef
 
-define Package/olsrd-luci-mod-tas/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/tas/olsrd_tas.so.* $(1)/usr/lib/
-endef
-
 
 $(eval $(call BuildPackage,olsrd-luci))
 $(eval $(call BuildPackage,olsrd-luci-mod-arprefresh))
@@ -228,6 +207,4 @@ $(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-tas))