activate hfsc, for http://www.voip-info.org/wiki-QoS+Linux+with+HFSC

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

diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index 41f7d67..19a1c5e 100644 (file)
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/package/openvpn/Makefile
@@ -1,22 +1,29 @@
-#############################################################
-#
-# ebtables
-#
-#############################################################
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn

-PKG_VERSION:=2.0_rc16
+PKG_VERSION:=2.0

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_SOURCE_URL:=http://puzzle.dl.sourceforge.net/sourceforge/openvpn
+PKG_MD5SUM:=7401faebc6baee9add32608709c54eec
+
+PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn

 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
 
 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
 

+ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+DISABLE_LZO:=--disable-lzo
+endif
+
+ifneq ($(BR2_PACKAGE_OPENVPN_SERVER),y)
+DISABLE_SERVER:=--disable-server
+endif
+

 $(DL_DIR)/$(PKG_SOURCE):
 $(DL_DIR)/$(PKG_SOURCE):

-        $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE)
+        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)

 
 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 
 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -


@@ -47,23 +54,30 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
                --disable-management \
                --disable-socks \
                --disable-http \
                --disable-management \
                --disable-socks \
                --disable-http \

+               $(DISABLE_LZO) \
+               $(DISABLE_SERVER) \

        );
        touch $(PKG_BUILD_DIR)/.configured
 
        );
        touch $(PKG_BUILD_DIR)/.configured
 

-$(PKG_BUILD_DIR)/usr/sbin/openvpn: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/openvpn: $(PKG_BUILD_DIR)/.configured

        $(MAKE) -C $(PKG_BUILD_DIR)
 
        $(MAKE) -C $(PKG_BUILD_DIR)
 

-$(PKG_IPK): $(PKG_BUILD_DIR)/usr/sbin/openvpn
+$(PKG_IPK): $(PKG_BUILD_DIR)/openvpn

        $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(PKG_IPK_DIR)/usr/sbin
        cp $(PKG_BUILD_DIR)/openvpn $(PKG_IPK_DIR)/usr/sbin/
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
        mkdir -p $(PKG_IPK_DIR)/usr/sbin
        cp $(PKG_BUILD_DIR)/openvpn $(PKG_IPK_DIR)/usr/sbin/

+       $(STRIP) $(PKG_IPK_DIR)/usr/sbin/*

        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
 

+$(IPKG_STATE_DIR)/info/openvpn.list: $(PKG_IPK)
+       $(IPKG) install $(PKG_IPK)
+

 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: $(PKG_BUILD_DIR)/.unpacked
 compile: $(PKG_IPK)
 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: $(PKG_BUILD_DIR)/.unpacked
 compile: $(PKG_IPK)

-install:
-       $(IPKG) install $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/openvpn.list
+

 clean:
        rm -rf $(PKG_BUILD_DIR)
 clean:
        rm -rf $(PKG_BUILD_DIR)

+       rm -f $(PKG_IPK)