Build usbnet modules for brcm targets (#1481)

[openwrt.git] / package / openswan / Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 1ea3b4b..d8f910b 100644 (file)
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -10,17 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.4.6
+PKG_VERSION:=2.4.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
-PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_INIT_PRIO:=60
+PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -43,15 +38,15 @@ define Package/openswan
   URL:=http://www.openswan.org/
 endef
 
-define Package/kmod-openswan
+define KernelPackage/openswan
+  SUBMENU:=Network Support
   $(call Package/openswan/Default)
-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
   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:= \
@@ -59,7 +54,7 @@ PKG_MAKE_OPTS:= \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \
+               USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 
@@ -67,22 +62,15 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \
-               module
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               $(PKG_MAKE_OPTS) \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               programs
+               LDFLAGS="$(TARGET_LDFLAGS)" \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               programs module install
 endef
 
 define Package/openswan/install
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               $(PKG_MAKE_OPTS) \
-               DESTDIR="$(1)" \
-               install
-       install -d -m0755 $(1)/etc/init.d
-       $(CP) $(1)/etc/rc.d/init.d/ipsec $(1)/etc/init.d/S$(PKG_INIT_PRIO)ipsec
+       $(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
@@ -90,11 +78,5 @@ define Package/openswan/install
        find $(1) -name \*.old | xargs rm -rf
 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)/
-endef
-
 $(eval $(call BuildPackage,openswan))
-$(eval $(call BuildPackage,kmod-openswan))
+$(eval $(call KernelPackage,openswan))