standardize Makefile, add userland daemon

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4832 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 61 insertions, 15 deletions

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index cc1707b2f..0f7a11a6e 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -12,36 +12,81 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=openswan
 PKG_VERSION:=2.4.6
 PKG_RELEASE:=1
-PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd
 
 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_SOURCE_URL:=http://www.openswan.org/download
+PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd
 PKG_CAT:=zcat
 
+PKG_INIT_PRIO:=60
+
 include $(INCLUDE_DIR)/package.mk
 
+define Package/openswan/Default
+  TITLE:=Openswan
+  DESCRIPTION:=\
+	Openswan is an IPsec implementation for Linux.
+  URL:=http://www.openswan.org/
+endef
+
+define Package/openswan
+  $(call Package/openswan/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+kmod-openswan +libgmp
+  TITLE+= (daemon)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the Openswan user-land daemon.
+  URL:=http://www.openswan.org/
+endef
+
 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)
+  $(call Package/openswan/Default)
+  SECTION:=kernel
+  CATEGORY:=Kernel drivers
+  TITLE+= (kernel module)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the Openswan kernel module.
+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
+PKG_MAKE_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)" \
+		USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \
+		IPSECDIR="/usr/lib/ipsec" \
+		INC_USRLOCAL="/usr" \
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(PKG_MAKE_OPTS) \
 		module
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(PKG_MAKE_OPTS) \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		programs
+endef
+
+define Package/openswan/install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(PKG_MAKE_OPTS) \
+		DESTDIR="$(1)" \
+		install
+	install -d -m0755 $(1)/etc/init.d
+	$(CP) $(1)/etc/rc.d/init.d/ipsec $(1)/etc/init.d/S$(PKG_INIT_PRIO)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
 
 define Package/kmod-openswan/install
@@ -50,4 +95,5 @@ define Package/kmod-openswan/install
 		$(1)/lib/modules/$(LINUX_VERSION)/
 endef
 
+$(eval $(call BuildPackage,openswan))
 $(eval $(call BuildPackage,kmod-openswan))