move openswan from target/linux/package to package/.

SVN-Revision: 3974

diff --git a/openwrt/package/openswan/Makefile b/openwrt/package/openswan/Makefile
new file mode 100644 (file)
index 0000000..1f41ccf
--- /dev/null
+++ b/openwrt/package/openswan/Makefile
@@ -0,0 +1,48 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+include $(TOPDIR)/package/kernel.mk
+
+PKG_NAME:=openswan
+PKG_VERSION:=2.4.5
+PKG_RELEASE:=1
+PKG_MD5SUM:=a9a8e88313faceebfc5ceb1a9da9a3c4
+
+PKG_SOURCE_URL:=http://www.openswan.org/download
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(TOPDIR)/package/rules.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)
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               $(TARGET_CONFIGURE_OPTS) \
+               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
+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))

diff --git a/openwrt/package/openswan/patches/101-arp_header.patch b/openwrt/package/openswan/patches/101-arp_header.patch
new file mode 100644 (file)
index 0000000..7375f65
--- /dev/null
+++ b/openwrt/package/openswan/patches/101-arp_header.patch
@@ -0,0 +1,11 @@
+diff -Nur openswan-2.4.5rc5/linux/net/ipsec/ipsec_tunnel.c openswan-2.4.5rc5.patched/linux/net/ipsec/ipsec_tunnel.c
+--- openswan-2.4.5rc5/linux/net/ipsec/ipsec_tunnel.c   2005-11-22 05:11:52.000000000 +0100
++++ openswan-2.4.5rc5.patched/linux/net/ipsec/ipsec_tunnel.c   2006-03-29 01:13:35.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <linux/types.h>  /* size_t */
+ #include <linux/interrupt.h> /* mark_bh */
+ 
++#include <net/arp.h>
+ #include <net/tcp.h>
+ #include <net/udp.h>
+ #include <linux/skbuff.h>

diff --git a/openwrt/target/linux/package/openswan/Config.in b/openwrt/target/linux/package/openswan/Config.in
deleted file mode 100644 (file)
index faf0f8f..0000000
--- a/openwrt/target/linux/package/openswan/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config PACKAGE_KMOD_OPENSWAN
-       prompt "kmod-openswan..................... Openswan kernel module"
-       tristate
-       default m if DEVEL
-       help
-         Openswan is an implementation of IPsec for Linux.
-         
-         http://www.openswan.org/
-         
-         This package contains the Openswan IPSec module for the kernel

diff --git a/openwrt/target/linux/package/openswan/Makefile b/openwrt/target/linux/package/openswan/Makefile
deleted file mode 100644 (file)
index 0a82895..0000000
--- a/openwrt/target/linux/package/openswan/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-include ../../rules.mk
-
-PKG_NAME:=openswan
-PKG_VERSION:=2.4.5
-PKG_RELEASE:=1
-PKG_MD5SUM:=a9a8e88313faceebfc5ceb1a9da9a3c4
-
-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,KMOD_OPENSWAN,kmod-openswan,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))))
-
-FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
-
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               LINUX_RELEASE="$(LINUX_RELEASE)" \
-               KERNELSRC="$(LINUX_DIR)" \
-               ARCH="$(LINUX_KARCH)" \
-               CROSS_COMPILE="$(TARGET_CROSS)" \
-               USERCOMPILE="$(FLAGS)" \
-               AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
-               module
-
-$(IPKG_KMOD_OPENSWAN):
-       mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/
-       $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR)

diff --git a/openwrt/target/linux/package/openswan/ipkg/kmod-openswan.control b/openwrt/target/linux/package/openswan/ipkg/kmod-openswan.control
deleted file mode 100644 (file)
index f06c80c..0000000
--- a/openwrt/target/linux/package/openswan/ipkg/kmod-openswan.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: kmod-openswan
-Priority: optional
-Section: net
-Description: Openswan IPSec kernel module

diff --git a/openwrt/target/linux/package/openswan/patches/101-arp_header.patch b/openwrt/target/linux/package/openswan/patches/101-arp_header.patch
deleted file mode 100644 (file)
index 7375f65..0000000
--- a/openwrt/target/linux/package/openswan/patches/101-arp_header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur openswan-2.4.5rc5/linux/net/ipsec/ipsec_tunnel.c openswan-2.4.5rc5.patched/linux/net/ipsec/ipsec_tunnel.c
---- openswan-2.4.5rc5/linux/net/ipsec/ipsec_tunnel.c   2005-11-22 05:11:52.000000000 +0100
-+++ openswan-2.4.5rc5.patched/linux/net/ipsec/ipsec_tunnel.c   2006-03-29 01:13:35.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <linux/types.h>  /* size_t */
- #include <linux/interrupt.h> /* mark_bh */
- 
-+#include <net/arp.h>
- #include <net/tcp.h>
- #include <net/udp.h>
- #include <linux/skbuff.h>