[packages_12.09] lispmob: Updating the package

[backport r35031]

Signed-off-by: Vasileios Lakafosis <lakafv@gmail.com>
Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_12.09@35076 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/lispmob/Makefile b/net/lispmob/Makefile
index 36399ba..c58a6ff 100644 (file)
--- a/net/lispmob/Makefile
+++ b/net/lispmob/Makefile
@@ -6,12 +6,11 @@
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=lispmob
-PKG_REV:=50eeffe971a07e06b2f1b73b0b7a6bc4167e0ab5
-PKG_VERSION:=20120417
-PKG_RELEASE:=1
+PKG_REV:=45ebcfc06097c039351b3bf6f1b3ae7bf66990e2
+PKG_VERSION:=0.3.0
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://github.com/LISPmob/lispmob.git
@@ -21,108 +20,31 @@ PKG_SOURCE_VERSION:=$(PKG_REV)
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/lisp
-  SUBMENU:=Network Support
-  TITLE:=LISP Protocol Support
-  DEPENDS:=+kmod-lisp-int +kmod-ipv6
+define Package/lispd/default
+  MAINTAINER:=Vasileios Lakafosis <lakafv@gmail.com>
   URL:=http://lisp.cisco.com/
-  FILES:=$(PKG_BUILD_DIR)/lisp_mod/lisp.ko
-  AUTOLOAD:=$(call AutoLoad,51,lisp)
-endef
-
-define KernelPackage/lisp/description
-  Kernel module for Locator/ID Separation Protocol
-endef
-
-define KernelPackage/lisp-int
-  SUBMENU:=Network Support
-  TITLE:=Logical Interface for LISP
-  URL:=http://lisp.cisco.com/
-  FILES:=$(PKG_BUILD_DIR)/lisp_int/lisp_int.ko
-  AUTOLOAD:=$(call AutoLoad,50,lisp_int)
-endef
-
-define KernelPackage/lisp-int/description
-  Kernel module for LISP logical interface
 endef
 
 define Package/lispd
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=Locator/ID separation protocol daemon
-  URL:=http://lisp.cisco.com/
-  DEPENDS:= +librt +libopenssl +confuse +kmod-lisp
+  TITLE:=Locator/ID separation protocol (using TUN)
+  URL:=https://github.com/LISPmob
+  DEPENDS:= +librt +libopenssl +confuse +kmod-tun +uci
+  $(call Package/lispd/default)
 endef
 
 define Package/lispd/description
-  lispd is the Locator/ID separation protocol daemon
-endef
-
-define Package/lispconf
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Tool to query the LISP kernel module
-  URL:=http://lisp.cisco.com/
-endef
-
-define Package/lispconf/description
-  lispconf can be used to query the kernel module for
-  information such as map-cache or database contents
-endef
-
-include $(INCLUDE_DIR)/kernel-defaults.mk
-
-ifdef CONFIG_PACKAGE_kmod-lisp
-  define Build/Compile/lisp
-       $(MAKE) $(KERNEL_MAKEOPTS) \
-               SUBDIRS="$(PKG_BUILD_DIR)/lisp_mod" \
-               modules
-  endef
-endif
-
-ifdef CONFIG_PACKAGE_kmod-lisp-int
-  define Build/Compile/lisp-int
-       $(MAKE) $(KERNEL_MAKEOPTS) \
-               SUBDIRS="$(PKG_BUILD_DIR)/lisp_int" \
-               modules
-  endef
-endif
-
-ifdef CONFIG_PACKAGE_lispd
-  define Build/Compile/lispd
-       +$(MAKE_VARS) \
-       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispd \
-               $(MAKE_FLAGS)
-  endef
-endif
-
-ifdef CONFIG_PACKAGE_lispconf
-  define Build/Compile/lispconf
-       +$(MAKE_VARS) \
-       $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lispconf \
-               $(MAKE_FLAGS)
-  endef
-endif
-
-define Build/Compile
-       $(Build/Compile/lisp)
-       $(Build/Compile/lisp-int)
-       $(Build/Compile/lispd)
-       $(Build/Compile/lispconf)
-endef
-
-define Package/lispconf/install
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lispconf/lispconf $(1)/usr/sbin/
+  This packet provides support for the Locator-ID support protocol.
 endef
 
 define Package/lispd/install
-       $(INSTALL_DIR) $(1)/etc $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/lispd/lispd $(1)/usr/sbin/
-       $(INSTALL_CONF) $(PKG_BUILD_DIR)/lispd/lispd.conf.example $(1)/etc/lispd.conf
+       $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/lispd/lispd.uci.example $(1)/etc/config/lispd
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lispd/openwrt.init.script $(1)/etc/init.d/lisp
 endef
 
-$(eval $(call KernelPackage,lisp))
-$(eval $(call KernelPackage,lisp-int))
 $(eval $(call BuildPackage,lispd))
-$(eval $(call BuildPackage,lispconf))

diff --git a/net/lispmob/patches/010-disable-modprobe.patch b/net/lispmob/patches/010-disable-modprobe.patch
deleted file mode 100644 (file)
index ad475ee..0000000
--- a/net/lispmob/patches/010-disable-modprobe.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/lispd/lispd.c
-+++ b/lispd/lispd.c
-@@ -160,6 +160,7 @@ int main(int argc, char **argv)
-      *  Unload/load LISP kernel modules
-      */
- 
-+/*
-     system("/sbin/modprobe -r lisp lisp_int");
- 
-     if (system("/sbin/modprobe lisp")) {
-@@ -175,6 +176,7 @@ int main(int argc, char **argv)
-     }
-     syslog(LOG_DAEMON, "Loaded the 'lisp_int' kernel module");
-     sleep(1);
-+*/
- 
-     /*
-      *  Setup LISP and routing netlink sockets
---- a/lispd/lispd_iface_mgmt.c
-+++ b/lispd/lispd_iface_mgmt.c
-@@ -1624,7 +1624,7 @@ void exit_cleanup(void) {
-     close(netlink_fd);
- 
-     /* Remove lisp modules */
--    system("/sbin/modprobe -r lisp lisp_int");
-+//    system("/sbin/modprobe -r lisp lisp_int");
- 
-     /* Remove source routing ip rule */
-     delete_source_routing(ctrl_iface, &source_rloc, NULL);