airlink generation fix, thanks st9_

[openwrt.git] / package / openswan / Makefile

diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index 4bfda30..d8f910b 100644 (file)
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -16,10 +16,6 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.openswan.org/download
 PKG_MD5SUM:=70f22e8adc39e07a165f75eccb7cd079

-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -42,15 +38,15 @@ define Package/openswan
   URL:=http://www.openswan.org/
 endef
 
   URL:=http://www.openswan.org/
 endef
 

-define Package/kmod-openswan
+define KernelPackage/openswan
+  SUBMENU:=Network Support

   $(call Package/openswan/Default)
   $(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)
   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:= \
 endef
 
 PKG_MAKE_OPTS:= \


@@ -58,7 +54,7 @@ PKG_MAKE_OPTS:= \
                KERNELSRC="$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                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" \
 
                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
 


@@ -66,7 +62,7 @@ define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                $(PKG_MAKE_OPTS) \

-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               LDFLAGS="$(TARGET_LDFLAGS)" \

                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef
                DESTDIR="$(PKG_INSTALL_DIR)" \
                programs module install
 endef


@@ -82,11 +78,5 @@ define Package/openswan/install
        find $(1) -name \*.old | xargs rm -rf
 endef
 
        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,openswan))

-$(eval $(call BuildPackage,kmod-openswan))
+$(eval $(call KernelPackage,openswan))