X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9207a4a4da7345a496f528715ca2556365179586..6c5121c214fe1a011b6ecabe22dc1372021eda44:/package/openswan/Makefile?ds=inline diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 0f7a11a6e..1fd2e20af 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -10,16 +10,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=openswan -PKG_VERSION:=2.4.6 +PKG_VERSION:=2.4.8 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 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 +PKG_MD5SUM:=918cc56ccf8e5d14cd2047e47450b34a include $(INCLUDE_DIR)/package.mk @@ -34,7 +30,7 @@ define Package/openswan $(call Package/openswan/Default) SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-openswan +libgmp + DEPENDS:=+kmod-openswan +libgmp +ip TITLE+= (daemon) DESCRIPTION+=\\\ \\\ @@ -42,15 +38,15 @@ define Package/openswan URL:=http://www.openswan.org/ endef -define Package/kmod-openswan +define KernelPackage/openswan + SUBMENU:=Network Support $(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) + FILES:=$(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) endef PKG_MAKE_OPTS:= \ @@ -58,7 +54,7 @@ PKG_MAKE_OPTS:= \ KERNELSRC="$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \ + USERCOMPILE="$(TARGET_CFLAGS) -I./linux/include $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)" \ IPSECDIR="/usr/lib/ipsec" \ INC_USRLOCAL="/usr" \ @@ -66,22 +62,15 @@ 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 + LDFLAGS="$(TARGET_LDFLAGS)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + programs module install 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 + $(CP) $(PKG_INSTALL_DIR)/* $(1) + $(INSTALL_DIR) $(1)/etc/init.d + $(CP) ./files/ipsec.init $(1)/etc/init.d/ipsec rm -rf $(1)/usr/share rm -rf $(1)/usr/man rm -rf $(1)/var @@ -89,11 +78,5 @@ define Package/openswan/install find $(1) -name \*.old | xargs rm -rf 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,openswan)) -$(eval $(call BuildPackage,kmod-openswan)) +$(eval $(call KernelPackage,openswan))