fix openvpn dependencies when removing lzo support

SVN-Revision: 798

diff --git a/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index 19a1c5e156ddeff19add4d4773c15a707c8f0f9d..ad2210fe55deb375fc5b1851ae4b4724fc9e6cc7 100644 (file)
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/package/openvpn/Makefile
@@ -14,8 +14,11 @@ PKG_CAT:=zcat
 PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
+PKG_DEPEND:="openssl, kmod-tun"
 ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y)
 DISABLE_LZO:=--disable-lzo
+else
+PKG_DEPEND+=", lzo"
 endif
 
 ifneq ($(BR2_PACKAGE_OPENVPN_SERVER),y)
@@ -64,6 +67,7 @@ $(PKG_BUILD_DIR)/openvpn: $(PKG_BUILD_DIR)/.configured
 
 $(PKG_IPK): $(PKG_BUILD_DIR)/openvpn
        $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+       echo "Depends: $(PKG_DEPEND)" >> $(PKG_IPK_DIR)/CONTROL/control
        mkdir -p $(PKG_IPK_DIR)/usr/sbin
        cp $(PKG_BUILD_DIR)/openvpn $(PKG_IPK_DIR)/usr/sbin/
        $(STRIP) $(PKG_IPK_DIR)/usr/sbin/*

diff --git a/openwrt/package/openvpn/openvpn.control b/openwrt/package/openvpn/openvpn.control
index b2739f49473a69546e98565119a84cd2e3aa0d23..6332d34d2a27a8b07a6ecd75464082ce90fda0a0 100644 (file)
--- a/openwrt/package/openvpn/openvpn.control
+++ b/openwrt/package/openvpn/openvpn.control
@@ -2,6 +2,5 @@ Package: openvpn
 Priority: optional
 Section: net
 Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Depends: lzo, openssl, kmod-tun
 Source: buildroot internal
 Description: Open Source VPN solution using SSL