Fix image creation when tun module is compiled into kernel by using RRECOMMENDS instead of RDEPENDS for kernel-module-tun.
Use INC_PR. Signed-off-by: Johan Hovold <[email protected]> --- This version also uses INC_PR and RRECOMMENDS_${PN} as suggested by Otavio Salvador and Phil Blundell, respectively. Thanks, Johan recipes/openvpn/openvpn.inc | 4 +++- recipes/openvpn/openvpn_1.5.0.bb | 2 +- recipes/openvpn/openvpn_1.6.0.bb | 2 +- recipes/openvpn/openvpn_2.0.2.bb | 2 +- recipes/openvpn/openvpn_2.0.9+2.1rc19.bb | 2 ++ recipes/openvpn/openvpn_2.0.9+2.1rc20.bb | 2 ++ recipes/openvpn/openvpn_2.0.9.bb | 2 +- recipes/openvpn/openvpn_2.0.bb | 2 +- 8 files changed, 12 insertions(+), 6 deletions(-) diff --git a/recipes/openvpn/openvpn.inc b/recipes/openvpn/openvpn.inc index 70cdf4c..97f3de7 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 = "kernel-module-tun" +RRECOMMENDS_${PN} = "kernel-module-tun" + +INC_PR = "r3" SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ file://openvpn" diff --git a/recipes/openvpn/openvpn_1.5.0.bb b/recipes/openvpn/openvpn_1.5.0.bb index 12cebf5..beaa92c 100644 --- a/recipes/openvpn/openvpn_1.5.0.bb +++ b/recipes/openvpn/openvpn_1.5.0.bb @@ -1,3 +1,3 @@ require openvpn.inc -PR = "r3" +PR = "${INC_PR}.1" diff --git a/recipes/openvpn/openvpn_1.6.0.bb b/recipes/openvpn/openvpn_1.6.0.bb index 5bb4a28..878a722 100644 --- a/recipes/openvpn/openvpn_1.6.0.bb +++ b/recipes/openvpn/openvpn_1.6.0.bb @@ -1,3 +1,3 @@ require openvpn.inc -PR = "r2" +PR = "${INC_PR}.0" diff --git a/recipes/openvpn/openvpn_2.0.2.bb b/recipes/openvpn/openvpn_2.0.2.bb index bb22dc9..878a722 100644 --- a/recipes/openvpn/openvpn_2.0.2.bb +++ b/recipes/openvpn/openvpn_2.0.2.bb @@ -1,3 +1,3 @@ require openvpn.inc -PR = "r1" +PR = "${INC_PR}.0" diff --git a/recipes/openvpn/openvpn_2.0.9+2.1rc19.bb b/recipes/openvpn/openvpn_2.0.9+2.1rc19.bb index 9375cd6..01ce08b 100644 --- a/recipes/openvpn/openvpn_2.0.9+2.1rc19.bb +++ b/recipes/openvpn/openvpn_2.0.9+2.1rc19.bb @@ -1,5 +1,7 @@ require openvpn.inc +PR = "${INC_PR}.0" + SRC_URI = "http://openvpn.net/release/openvpn-2.1_rc19.tar.gz \ file://openvpn" diff --git a/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb b/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb index f671e15..d2bb3c0 100644 --- a/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb +++ b/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb @@ -1,5 +1,7 @@ require openvpn.inc +PR = "${INC_PR}.0" + SRC_URI = "http://openvpn.net/release/openvpn-2.1_rc20.tar.gz \ file://openvpn" diff --git a/recipes/openvpn/openvpn_2.0.9.bb b/recipes/openvpn/openvpn_2.0.9.bb index 5bb4a28..878a722 100644 --- a/recipes/openvpn/openvpn_2.0.9.bb +++ b/recipes/openvpn/openvpn_2.0.9.bb @@ -1,3 +1,3 @@ require openvpn.inc -PR = "r2" +PR = "${INC_PR}.0" diff --git a/recipes/openvpn/openvpn_2.0.bb b/recipes/openvpn/openvpn_2.0.bb index bb22dc9..878a722 100644 --- a/recipes/openvpn/openvpn_2.0.bb +++ b/recipes/openvpn/openvpn_2.0.bb @@ -1,3 +1,3 @@ require openvpn.inc -PR = "r1" +PR = "${INC_PR}.0" -- 1.6.5.6 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
