remove duplicate package/ prefix from package dump error message

[openwrt.git] / package / openswan / Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 6171656..6e51853 100644 (file)
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -1,82 +1,53 @@
+# 
+# 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.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=x
+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
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
-
-$(DL_DIR)/$(PKG_SOURCE):
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
 
-$(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
+include $(INCLUDE_DIR)/package.mk
 
-FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
+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)/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched
+define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
+               LINUX_RELEASE="$(LINUX_RELEASE)" \
                KERNELSRC="$(LINUX_DIR)" \
-               ARCH="mips" \
-               USERCOMPILE="$(FLAGS)" \
+               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
-       $(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
-
-$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       $(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)
+endef
 
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
+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
 
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(PKG_IPK)
+$(eval $(call BuildPackage,kmod-openswan))