X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/aa872c9219775f8f6f771f798a4ab8aaf7eaf215..f08f0691af7bd6dc266fff403ca4ac8b48fa62cb:/package/openswan/Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 61716564c..9035a3c98 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -1,82 +1,83 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.3.1dr6
+PKG_VERSION:=2.4.8
 PKG_RELEASE:=1
-PKG_MD5SUM:=x
 
-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
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
+PKG_SOURCE_URL:=http://www.openswan.org/download
+PKG_MD5SUM:=918cc56ccf8e5d14cd2047e47450b34a
 
-$(DL_DIR)/$(PKG_SOURCE):
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+include $(INCLUDE_DIR)/package.mk
 
-$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE)
-	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(PATCH) $(PKG_BUILD_DIR) ./patches
-	touch $(PKG_BUILD_DIR)/.patched
+define Package/openswan/Default
+  TITLE:=Openswan
+  DESCRIPTION:=\
+	Openswan is an IPsec implementation for Linux.
+  URL:=http://www.openswan.org/
+endef
 
-FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
+define Package/openswan
+  $(call Package/openswan/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=@LINUX_2_4 +kmod-openswan +libgmp +ip
+  TITLE+= (daemon)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the Openswan user-land daemon.
+  URL:=http://www.openswan.org/
+endef
 
-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		KERNELSRC="$(LINUX_DIR)" \
-		ARCH="mips" \
-		USERCOMPILE="$(FLAGS)" \
-		module
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
+define KernelPackage/openswan
+  SUBMENU:=Network Support
+  $(call Package/openswan/Default)
+  DEPENDS:=@LINUX_2_4 
+  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="mips" \
-		USERCOMPILE="$(FLAGS)" \
-		EXTRA_INCLUDE="-I$(STAGING_DIR)/usr/include" \
-		EXTRA_LIBS="-L$(STAGING_DIR)/usr/lib" \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
 		IPSECDIR="/usr/lib/ipsec" \
 		INC_USRLOCAL="/usr" \
-		programs
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
-	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		DESTDIR="$(PKG_IPK_DIR)" \
-		KERNELSRC="$(LINUX_DIR)" \
-		ARCH="mips" \
-		USERCOMPILE="$(FLAGS)" \
-		IPSECDIR="/usr/lib/ipsec" \
-		INC_USRLOCAL="/usr" \
-		install
-	-$(STRIP) $(PKG_IPK_DIR)/usr/lib/ipsec/*
-	-$(STRIP) $(PKG_IPK_DIR)/usr/libexec/ipsec/*
-	rm -rf $(PKG_IPK_DIR)/usr/share
-	rm -rf $(PKG_IPK_DIR)/usr/man
-	rm -rf $(PKG_IPK_DIR)/var
-	rm -rf $(PKG_IPK_DIR)/etc/rc.d/rc*.d
-	mkdir -p $(PKG_IPK_DIR)/etc/init.d
-	ln -sf ../rc.d/init.d/ipsec $(PKG_IPK_DIR)/etc/init.d/S60ipsec
-	mkdir -p $(PKG_IPK_DIR)/lib/modules/$(LINUX_VERSION)
-	cp $(PKG_BUILD_DIR)/modobj/ipsec.o $(PKG_IPK_DIR)/lib/modules/$(LINUX_VERSION)/
-	$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note \
-	  $(PKG_IPK_DIR)/lib/modules/$(LINUX_VERSION)/ipsec.o
-	mkdir -p $(PACKAGE_DIR)
-	find $(PKG_BUILD_DIR) -name \*.old | xargs rm -rf
-	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
-
-$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
-	$(IPKG) install $(PKG_IPK)
+		$(PKG_MAKE_OPTS) \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		programs module install
+endef
 
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+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
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
-	rm -f $(PKG_IPK)
+$(eval $(call BuildPackage,openswan))
+$(eval $(call KernelPackage,openswan))