Package multipath kernel modules from #1608

[openwrt.git] / package / openswan / Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index cc1707b..a301289 100644 (file)
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -10,44 +10,73 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan

-PKG_VERSION:=2.4.6
+PKG_VERSION:=2.4.7

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://www.openswan.org/download

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_CAT:=zcat
+PKG_SOURCE_URL:=http://www.openswan.org/download
+PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

-define Package/kmod-openswan
-SECTION:=drivers
-CATEGORY:=Drivers
-DEPENDS:=
-TITLE:=Openswan kernel module
-DESCRIPTION:=Openswan kernel module \\\
-Openswan is an implementation of IPsec for Linux.
-URL:=http://www.openswan.org/
-VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+define Package/openswan/Default
+  TITLE:=Openswan
+  DESCRIPTION:=\
+       Openswan is an IPsec implementation for Linux.
+  URL:=http://www.openswan.org/

 endef
 
 endef
 

-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
+define Package/openswan
+  $(call Package/openswan/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-openswan +libgmp +ip
+  TITLE+= (daemon)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains the Openswan user-land daemon.
+  URL:=http://www.openswan.org/
+endef
+
+define KernelPackage/openswan
+  SUBMENU:=Network Support
+  $(call Package/openswan/Default)
+  TITLE+= (kernel module)
+  DESCRIPTION+=\\\
+       \\\
+       This package contains the Openswan kernel module.
+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
+endef
+
+PKG_MAKE_OPTS:= \

                LINUX_RELEASE="$(LINUX_RELEASE)" \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                LINUX_RELEASE="$(LINUX_RELEASE)" \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \

-               USERCOMPILE="$(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib " \
-               AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
-               module
+               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
+               IPSECDIR="/usr/lib/ipsec" \
+               INC_USRLOCAL="/usr" \
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               $(PKG_MAKE_OPTS) \
+               LDFLAGS="$(TARGET_LDFLAGS)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               programs module install

 endef
 
 endef
 

-define Package/kmod-openswan/install
-       mkdir -p $(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) \
-               $(1)/lib/modules/$(LINUX_VERSION)/
+define Package/openswan/install
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)
+       $(INSTALL_DIR) $(1)/etc/init.d
+       $(CP) ./files/ipsec.init $(1)/etc/init.d/ipsec
+       rm -rf $(1)/usr/share
+       rm -rf $(1)/usr/man
+       rm -rf $(1)/var
+       rm -rf $(1)/etc/rc.d
+       find $(1) -name \*.old | xargs rm -rf

 endef
 
 endef
 

-$(eval $(call BuildPackage,kmod-openswan))
+$(eval $(call BuildPackage,openswan))
+$(eval $(call KernelPackage,openswan))