Add fix from whiterussian

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

diff --git a/openwrt/package/openswan/Makefile b/openwrt/package/openswan/Makefile
index 8214e74..0e92d8a 100644 (file)
--- a/openwrt/package/openswan/Makefile
+++ b/openwrt/package/openswan/Makefile
@@ -11,26 +11,20 @@ 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_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)
+include $(TOPDIR)/package/rules.mk

 
 

-$(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
+$(eval $(call PKG_template,OPENSWAN,openswan,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 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
 

-$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               $(TARGET_CONFIGURE_OPTS) \
-               KERNELSRC="$(LINUX_DIR)" \
-               ARCH="mips" \
-               USERCOMPILE="$(FLAGS)" \
-               module
+$(PKG_BUILD_DIR)/.built:
+#      $(MAKE) -C $(PKG_BUILD_DIR) \
+#              $(TARGET_CONFIGURE_OPTS) \
+#              KERNELSRC="$(LINUX_DIR)" \
+#              ARCH="mips" \
+#              USERCOMPILE="$(FLAGS)" \
+#              module

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                KERNELSRC="$(LINUX_DIR)" \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                KERNELSRC="$(LINUX_DIR)" \


@@ -42,41 +36,24 @@ $(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched
                INC_USRLOCAL="/usr" \
                programs
 
                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)
+$(IPKG_OPENSWAN):

        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               DESTDIR="$(PKG_IPK_DIR)" \
+               DESTDIR="$(IDIR_OPENSWAN)" \

                KERNELSRC="$(LINUX_DIR)" \
                ARCH="mips" \
                USERCOMPILE="$(FLAGS)" \
                IPSECDIR="/usr/lib/ipsec" \
                INC_USRLOCAL="/usr" \
                install
                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)
+       -$(STRIP) $(IDIR_OPENSWAN)/usr/lib/ipsec/*
+       -$(STRIP) $(IDIR_OPENSWAN)/usr/libexec/ipsec/*
+       rm -rf $(IDIR_OPENSWAN)/usr/share
+       rm -rf $(IDIR_OPENSWAN)/usr/man
+       rm -rf $(IDIR_OPENSWAN)/var
+       rm -rf $(IDIR_OPENSWAN)/etc/rc.d/rc*.d
+       mkdir -p $(IDIR_OPENSWAN)/etc/init.d
+       ln -sf ../rc.d/init.d/ipsec $(IDIR_OPENSWAN)/etc/init.d/S60ipsec

        find $(PKG_BUILD_DIR) -name \*.old | xargs rm -rf
        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)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.patched
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(PKG_IPK)
+       mkdir -p $(PACKAGE_DIR)
+       $(IPKG_BUILD) $(IDIR_OPENSWAN) $(PACKAGE_DIR)