packages/rp-l2tp: use new service functions

[packages.git] / net / openl2tp / Makefile

diff --git a/net/openl2tp/Makefile b/net/openl2tp/Makefile
index c8e66d8..a263e1a 100644 (file)
--- a/net/openl2tp/Makefile
+++ b/net/openl2tp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,29 +10,30 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openl2tp
 PKG_VERSION:=1.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/openl2tp
 PKG_MD5SUM:=e3d08dedfb9e6a9a1e24f6766f6dadd0
 
-PKG_BUILD_DEPENDS:=libreadline libncurses
+PKG_BUILD_DEPENDS:=libreadline libncurses USE_UCLIBC:librpc
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
-PPPD_VERSION:=2.4.4
+PPPD_VERSION:=2.4.5
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/openl2tp
+define Package/openl2tp/Default
+  SUBMENU:=VPN
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+ppp +kmod-pppol2tp +portmap +libreadline +libncurses \
-       @!LINUX_2_4 $(LIBRPC_DEPENDS)
   TITLE:=An L2TP (Layer 2 Tunneling Protocol) daemon
   URL:=http://www.openl2tp.org/
-  SUBMENU:=VPN
+  PROVIDES:=openl2tp
+  DEPENDS:=+ppp +kmod-pppol2tp
 endef
 
-define Package/openl2tp/description
+define Package/openl2tp/description/Default
  OpenL2TP is an open source L2TP client/server, written by Katalix Systems
  specifically for Linux. It has been designed for use as an enterprise 
  L2TP VPN server or in commercial, Linux-based, embedded networking
@@ -40,6 +41,34 @@ define Package/openl2tp/description
  configuration.
 endef
 
+
+define Package/openl2tp-full
+$(call Package/openl2tp/Default)
+  TITLE+=(full)
+  VARIANT:=full
+  DEPENDS+=+portmap +libreadline +libncurses $(LIBRPC_DEPENDS)
+endef
+
+define Package/openl2tp-full/description
+$(call Package/openl2tp/description/Default)
+ .
+ This package a full-featured, RPC-enabled OpenL2TP.
+endef
+
+
+define Package/openl2tp-mini
+$(call Package/openl2tp/Default)
+  TITLE+=(mini)
+  VARIANT:=mini
+endef
+
+define Package/openl2tp-mini/description
+$(call Package/openl2tp/description/Default)
+ .
+ This package a minimal-featured, RPC-disabled OpenL2TP.
+endef
+
+
 MAKE_FLAGS+= \
        KERNEL_SRCDIR="$(LINUX_DIR)" \
        KERNEL_BLDDIR="$(LINUX_DIR)" \
@@ -47,10 +76,32 @@ MAKE_FLAGS+= \
        READLINE_DIR="$(STAGING_DIR)/usr" \
        PPPD_SRCDIR="$(STAGING_DIR)/usr/include" \
        PPPD_LIBDIR="$(STAGING_DIR)/usr/lib" \
-       CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-       LIBS.dmalloc="-L$(STAGING_DIR)/usr/lib $(LIBRPC)"
+       CFLAGS.optimize="$(TARGET_CFLAGS)" \
+       CPPFLAGS-y="-I$(STAGING_DIR)/usr/include" \
+       L2TP_FEATURE_LOCAL_CONF_FILE=y \
+
+ifeq ($(BUILD_VARIANT),full)
+
+  MAKE_FLAGS += \
+       L2TP_FEATURE_RPC_MANAGEMENT=y \
+       L2TP_FEATURE_LOCAL_STAT_FILE=y \
+       LIBS.dmalloc="-L$(STAGING_DIR)/usr/lib $(LIBRPC)" \
 
-define Package/openl2tp/install
+endif
+ifeq ($(BUILD_VARIANT),mini)
+
+  MAKE_FLAGS += \
+       L2TP_FEATURE_RPC_MANAGEMENT= \
+       L2TP_FEATURE_LOCAL_STAT_FILE= \
+
+endif
+
+define Build/Prepare
+       $(call Build/Prepare/Default)
+       $(CP) ./src/*.[ch] $(PKG_BUILD_DIR)/
+endef
+
+define Package/openl2tp-full/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/l2tpconfig  $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/sbin
@@ -65,4 +116,15 @@ define Package/openl2tp/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/plugins/ppp_unix.so $(1)/usr/lib/openl2tp/
 endef
 
-$(eval $(call BuildPackage,openl2tp))
+define Package/openl2tp-mini/install
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/openl2tpd $(1)/usr/sbin/
+       $(INSTALL_DIR) $(1)/usr/lib/pppd/$(PPPD_VERSION)
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/pppd/pppol2tp.so $(1)/usr/lib/pppd/$(PPPD_VERSION)/
+       $(INSTALL_DIR) $(1)/usr/lib/openl2tp
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/plugins/ipsec.so $(1)/usr/lib/openl2tp/
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/plugins/ppp_unix.so $(1)/usr/lib/openl2tp/
+endef
+
+$(eval $(call BuildPackage,openl2tp-full))
+$(eval $(call BuildPackage,openl2tp-mini))