X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=contrib%2Fpackage%2Folsrd-luci%2FMakefile;h=56dc833d79fea62df70de0464ada33b9bf4fc83e;hp=52166d7a0f4474ff5735a76802f62b56f89c66ff;hb=d674c54faca07cf84ecd45458028c1364b58e448;hpb=f8b5b746aca6a9c49d43a98ebeb4b43b344f91ca diff --git a/contrib/package/olsrd-luci/Makefile b/contrib/package/olsrd-luci/Makefile index 52166d7a0..56dc833d7 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. @@ -9,14 +9,24 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=olsrd-luci -PKG_VERSION:=0.5.6-rc7 +PKG_BASENAME:=olsrd +PKG_NAME:=$(PKG_BASENAME)-luci +PKG_BASEVER:=0.5.6-r3 +PKG_VERSION:=$(PKG_BASEVER)+hg1781 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.olsr.org/releases/0.5 -PKG_MD5SUM:=10fbf796792d51eda735d171b6c86941 +PKG_HGREV:=ecb9cb41f488 +PKG_SOURCE:=$(PKG_HGREV).tar.gz +PKG_SOURCE_URL:=http://gredler.at/hg/olsrd-0.5.6/archive +PKG_MD5SUM:=554baef838afe51cf1f7238f2ba28db0 +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) include $(INCLUDE_DIR)/package.mk @@ -26,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 + MAINTAINER:=Jo-Philipp Wich endef define Package/olsrd-luci @@ -35,6 +45,10 @@ define Package/olsrd-luci DEPENDS:=+libpthread endef +define Package/olsrd-luci/conffiles +/etc/config/olsrd +endef + define Package/olsrd-luci-mod-arprefresh $(call Package/olsrd-luci/common_info) MENU:=1 @@ -54,7 +68,7 @@ define Package/olsrd-luci-mod-bmf MENU:=1 TITLE:=OLSR - Basic Multicast Forwarding Plugin DEPENDS:=olsrd-luci +kmod-tun -endef +endef define Package/olsrd-luci-mod-dyn-gw $(call Package/olsrd-luci/common_info) @@ -98,32 +112,34 @@ 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-tas +define Package/olsrd-luci-mod-mdns $(call Package/olsrd-luci/common_info) MENU:=1 - TITLE:=OLSR - Tiny Application Server Plugin + TITLE:=OLSR - mDNS Plugin DEPENDS:=olsrd-luci endef +TARGET_CFLAGS += $(FPIC) + define Build/Compile - $(MAKE) -C "$(PKG_BUILD_DIR)" olsrd-luci libs \ + $(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" \ @@ -132,78 +148,76 @@ 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 watchdog mdns" endef define Package/olsrd-luci/install $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_DIR) $(1)/lib/config $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd-luci $(1)/usr/sbin/ - $(INSTALL_BIN) ./files/etc/init.d/olsrd-luci $(1)/etc/init.d/ - $(INSTALL_CONF) ./files/etc/config/olsr $(1)/etc/config/ - $(INSTALL_DATA) ./files/lib/config/olsr.lua $(1)/lib/config/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/olsrd $(1)/usr/sbin/ + $(INSTALL_BIN) ./files/etc/init.d/olsrd $(1)/etc/init.d/ + $(INSTALL_CONF) ./files/etc/config/olsrd $(1)/etc/config/ endef define Package/olsrd-luci-mod-arprefresh/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/arprefresh/olsrd-luci_arprefresh.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/arprefresh/olsrd_arprefresh.so.* $(1)/usr/lib/ endef define Package/olsrd-luci-mod-dot-draw/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/dot_draw/olsrd-luci_dot_draw.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dot_draw/olsrd_dot_draw.so.* $(1)/usr/lib/ endef define Package/olsrd-luci-mod-bmf/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/bmf/olsrd-luci_bmf.so.* $(1)/usr/lib/ -endef + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/bmf/olsrd_bmf.so.* $(1)/usr/lib/ +endef define Package/olsrd-luci-mod-dyn-gw/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/dyn_gw/olsrd-luci_dyn_gw.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dyn_gw/olsrd_dyn_gw.so.* $(1)/usr/lib/ endef define Package/olsrd-luci-mod-dyn-gw-plain/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/dyn_gw_plain/olsrd-luci_dyn_gw_plain.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/dyn_gw_plain/olsrd_dyn_gw_plain.so.* $(1)/usr/lib/ endef define Package/olsrd-luci-mod-httpinfo/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/httpinfo/olsrd-luci_httpinfo.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/httpinfo/olsrd_httpinfo.so.* $(1)/usr/lib/ endef define Package/olsrd-luci-mod-nameservice/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/nameservice/olsrd-luci_nameservice.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/nameservice/olsrd_nameservice.so.* $(1)/usr/lib/ endef define Package/olsrd-luci-mod-secure/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/secure/olsrd-luci_secure.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/secure/olsrd_secure.so.* $(1)/usr/lib/ endef define Package/olsrd-luci-mod-txtinfo/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/txtinfo/olsrd-luci_txtinfo.so.* $(1)/usr/lib/ + $(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_DATA) $(PKG_BUILD_DIR)/lib/pgraph/olsrd-luci_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_DATA) $(PKG_BUILD_DIR)/lib/quagga/olsrd-luci_quagga.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/watchdog/olsrd_watchdog.so.* $(1)/usr/lib/ endef -define Package/olsrd-luci-mod-tas/install +define Package/olsrd-luci-mod-mdns/install $(INSTALL_DIR) $(1)/usr/lib - $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/tas/olsrd-luci_tas.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/mdns/olsrd_mdns.so.* $(1)/usr/lib/ endef @@ -217,7 +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-tas)) - +$(eval $(call BuildPackage,olsrd-luci-mod-watchdog)) +$(eval $(call BuildPackage,olsrd-luci-mod-mdns))