aboutsummaryrefslogtreecommitdiffstats
path: root/package/openswan/Makefile
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-12-03 19:48:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-12-03 19:48:11 +0000
commit856e457b7301947f17866dc4a5aedb3f7117f163 (patch)
tree5f4400235fcdaaa6eba40b08db304d60440936ff /package/openswan/Makefile
parent2bcaf23a684175838599c7755b6345da7312e12d (diff)
downloadupstream-856e457b7301947f17866dc4a5aedb3f7117f163.tar.gz
upstream-856e457b7301947f17866dc4a5aedb3f7117f163.tar.bz2
upstream-856e457b7301947f17866dc4a5aedb3f7117f163.zip
update openswan to 0.4.10, reenable 2.6 support, sync with included openwrt packaging code (ported from wr to kamikaze)
SVN-Revision: 9651
Diffstat (limited to 'package/openswan/Makefile')
-rw-r--r--package/openswan/Makefile40
1 files changed, 23 insertions, 17 deletions
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 9e786156b7..b53d1cbfc1 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=openswan
-PKG_VERSION:=2.4.8
+PKG_VERSION:=2.4.10
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.openswan.org/download
-PKG_MD5SUM:=918cc56ccf8e5d14cd2047e47450b34a
+PKG_MD5SUM:=2b36785342c74d524d8d86bde89a445f
include $(INCLUDE_DIR)/package.mk
@@ -32,7 +32,7 @@ define Package/openswan
$(call Package/openswan/Default)
SECTION:=net
CATEGORY:=Network
- DEPENDS:=@LINUX_2_4 +kmod-openswan +libgmp +ip
+ DEPENDS:=+kmod-openswan +libgmp +ip
TITLE+= (daemon)
URL:=http://www.openswan.org/
endef
@@ -45,7 +45,6 @@ endef
define KernelPackage/openswan
$(call Package/openswan/Default)
SUBMENU:=Network Support
- DEPENDS:=@LINUX_2_4
TITLE+= (kernel module)
FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX)
endef
@@ -55,22 +54,29 @@ $(call Package/openswan/Default/description)
This package contains the Openswan kernel module.
endef
+TARGET_CPPFLAGS = \
+ -I$(STAGING_DIR)/usr/include \
+ -I$(LINUX_DIR)/include
-PKG_MAKE_OPTS:= \
- LINUX_RELEASE="$(LINUX_RELEASE)" \
- KERNELSRC="$(LINUX_DIR)" \
- ARCH="$(LINUX_KARCH)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
- IPSECDIR="/usr/lib/ipsec" \
- INC_USRLOCAL="/usr" \
+TARGET_LDFLAGS = \
+ -L$(STAGING_DIR)/usr/lib
+
+OPENSWAN_MAKE := $(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 $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \
+ IPSECDIR="/usr/lib/ipsec" \
+ INC_USRLOCAL="/usr" \
+ INC_RCDEFAULT="/etc/init.d" \
+ MODPROBE="/sbin/insmod" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ DESTDIR="$(PKG_INSTALL_DIR)"
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- $(TARGET_CONFIGURE_OPTS) \
- $(PKG_MAKE_OPTS) \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
+ $(OPENSWAN_MAKE) \
programs module install
endef