openvpn: change kernel-module-tun to RRECOMMEND

RRECOMMEND, not RDEPEND, in case a particular platform doesn't have
a separate kernel-module-tun package. Matches behaviour of other
packages, like bridge-utils.

Also switch to INC_PR.

Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Roman I Khimov <khimov@altell.ru>

diff --git a/recipes/openvpn/openvpn.inc b/recipes/openvpn/openvpn.inc
index c4870b5..68bfc51 100644 (file)
--- a/recipes/openvpn/openvpn.inc
+++ b/recipes/openvpn/openvpn.inc
@@ -4,7 +4,9 @@ SECTION = "console/network"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
 DEPENDS = "lzo openssl"
-RDEPENDS_${PN} = "kernel-module-tun"
+RRECOMMENDS_${PN} = "kernel-module-tun"
+
+INC_PR = "r2"
 
 SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
        file://openvpn"

diff --git a/recipes/openvpn/openvpn_2.1.0.bb b/recipes/openvpn/openvpn_2.1.0.bb
index 16d551f..69d1da5 100644 (file)
--- a/recipes/openvpn/openvpn_2.1.0.bb
+++ b/recipes/openvpn/openvpn_2.1.0.bb
@@ -1,6 +1,6 @@
 require openvpn.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 SRC_URI = "http://openvpn.net/release/${P}.tar.gz \
           file://openvpn"
 

diff --git a/recipes/openvpn/openvpn_2.1.3.bb b/recipes/openvpn/openvpn_2.1.3.bb
index c448151..ceadf31 100644 (file)
--- a/recipes/openvpn/openvpn_2.1.3.bb
+++ b/recipes/openvpn/openvpn_2.1.3.bb
@@ -1,6 +1,6 @@
 require openvpn.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
 SRC_URI = "http://openvpn.net/release/${P}.tar.gz \
           file://openvpn"