update ar7 config for new kernel patches

[openwrt.git] / openwrt / target / linux / package / openswan / Makefile

diff --git a/openwrt/target/linux/package/openswan/Makefile b/openwrt/target/linux/package/openswan/Makefile
index 5ebb870..d54ffae 100644 (file)
--- a/openwrt/target/linux/package/openswan/Makefile
+++ b/openwrt/target/linux/package/openswan/Makefile
@@ -1,6 +1,7 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
 # $Id$
 
 include $(TOPDIR)/rules.mk

+include ../../rules.mk

 
 PKG_NAME:=openswan
 PKG_VERSION:=2.3.1
 
 PKG_NAME:=openswan
 PKG_VERSION:=2.3.1


@@ -18,7 +19,7 @@ ifeq ($(KERNEL_DIR),)
 KERNEL_DIR:=$(LINUX_DIR)
 endif
 
 KERNEL_DIR:=$(LINUX_DIR)
 endif
 

-$(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,KMOD_OPENSWAN,kmod-openswan,$(LINUX_VERSION)$(BOARD)+$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE))))

 
 FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
 
 
 FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
 


@@ -26,7 +27,7 @@ $(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                KERNELSRC="$(KERNEL_DIR)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                KERNELSRC="$(KERNEL_DIR)" \

-               ARCH="mips" \
+               ARCH="$(LINUX_KARCH)" \

                USERCOMPILE="$(FLAGS)" \
                module
 
                USERCOMPILE="$(FLAGS)" \
                module