build system cleanup. move shared include files into $(TOPDIR)/include, move lzma...

[openwrt.git] / package / openswan / Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 178ae3b..f810965 100644 (file)
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -1,57 +1,47 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/include/kernel.mk
 
 PKG_NAME:=openswan
-PKG_VERSION:=2.4.2
+PKG_VERSION:=2.4.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=38c7ad91312bdd67fa57fe987b21183e
+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
+include $(TOPDIR)/include/package.mk
 
-$(PKG_BUILD_DIR)/.configured:
-       touch $@
+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
 
-$(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 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))