[oe-commits] Michael Smith : openvpn: change kernel-module-tun to RRECOMMEND

git version control git at git.openembedded.org
Mon Sep 27 11:54:19 UTC 2010


Module: openembedded.git
Branch: master
Commit: 3619711f4c1c3e99d542801259d029e74a8cab8b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3619711f4c1c3e99d542801259d029e74a8cab8b

Author: Michael Smith <msmith at cbnco.com>
Date:   Fri Sep 24 14:46:20 2010 -0400

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 at cbnco.com>
Acked-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/openvpn/openvpn.inc      |    4 +++-
 recipes/openvpn/openvpn_2.1.0.bb |    2 +-
 recipes/openvpn/openvpn_2.1.3.bb |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes/openvpn/openvpn.inc b/recipes/openvpn/openvpn.inc
index c4870b5..68bfc51 100644
--- 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
--- 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
--- 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"
 





More information about the Openembedded-commits mailing list