X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/1384a25d8e11d23b0680dca4a7dd9cc46dbdf4eb..8ae87f1f26813082558365da1ad7f747dc83e2f7:/package/openswan/Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 2cfdc2188..4a1a42cc0 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -1,57 +1,47 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/package/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.4.4
+PKG_VERSION:=2.4.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=bd1a46c64727674149de61da2a32ca63
+PKG_MD5SUM:=a9a8e88313faceebfc5ceb1a9da9a3c4
 
+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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,OPENSWAN,openswan,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		KERNELSRC="$(LINUX_DIR)" \
-		ARCH="mips" \
-		USERCOMPILE="$(FLAGS)" \
-		EXTRA_INCLUDE="-I$(STAGING_DIR)/usr/include" \
-		EXTRA_LIBS="-L$(STAGING_DIR)/usr/lib" \
-		IPSECDIR="/usr/lib/ipsec" \
-		INC_USRLOCAL="/usr" \
-		programs
-	touch $@
-
-$(IPKG_OPENSWAN):
+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)
+endef
+
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(IDIR_OPENSWAN)" \
+		LINUX_RELEASE="$(LINUX_RELEASE)" \
 		KERNELSRC="$(LINUX_DIR)" \
-		ARCH="mips" \
-		USERCOMPILE="$(FLAGS)" \
-		IPSECDIR="/usr/lib/ipsec" \
-		INC_USRLOCAL="/usr" \
-		install
-	-$(STRIP) $(IDIR_OPENSWAN)/usr/lib/ipsec/*
-	-$(STRIP) $(IDIR_OPENSWAN)/usr/libexec/ipsec/*
-	rm -rf $(IDIR_OPENSWAN)/usr/share
-	rm -rf $(IDIR_OPENSWAN)/usr/man
-	rm -rf $(IDIR_OPENSWAN)/var
-	rm -rf $(IDIR_OPENSWAN)/etc/rc.d/rc*.d
-	mkdir -p $(IDIR_OPENSWAN)/etc/init.d
-	ln -sf ../rc.d/init.d/ipsec $(IDIR_OPENSWAN)/etc/init.d/S60ipsec
-	find $(PKG_BUILD_DIR) -name \*.old | xargs rm -rf
-	mkdir -p $(PACKAGE_DIR)
-	$(IPKG_BUILD) $(IDIR_OPENSWAN) $(PACKAGE_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
+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,kmod-openswan))