[oe] [meta-networking, meta-oe][PATCH 3/9] openvpn: move to meta-networking and tweak

[Paul Eggleton]

* Move SRC_URI checksums next to SRC_URI
* Move packaging definitions to the end
* Set SUMMARY instead of DESCRIPTION
* Drop unused inc file

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
 .../recipes-support}/openvpn/openvpn/openvpn       |    0
 .../recipes-support}/openvpn/openvpn_2.1.3.bb      |    9 ++++----
 meta-oe/recipes-connectivity/openvpn/openvpn.inc   |   22 --------------------
 3 files changed, 5 insertions(+), 26 deletions(-)
 rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/openvpn/openvpn/openvpn (100%)
 rename {meta-oe/recipes-connectivity => meta-networking/recipes-support}/openvpn/openvpn_2.1.3.bb (92%)
 delete mode 100644 meta-oe/recipes-connectivity/openvpn/openvpn.inc

diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn/openvpn b/meta-networking/recipes-support/openvpn/openvpn/openvpn
similarity index 100%
rename from meta-oe/recipes-connectivity/openvpn/openvpn/openvpn
rename to meta-networking/recipes-support/openvpn/openvpn/openvpn
diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb b/meta-networking/recipes-support/openvpn/openvpn_2.1.3.bb
similarity index 92%
rename from meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb
rename to meta-networking/recipes-support/openvpn/openvpn_2.1.3.bb
index 594b266..f58756e 100644
--- a/meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.1.3.bb
@@ -1,16 +1,18 @@
-DESCRIPTION = "A full-featured SSL VPN solution via tun device."
+SUMMARY = "A full-featured SSL VPN solution via tun device."
 HOMEPAGE = "http://openvpn.sourceforge.net"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c"
 DEPENDS = "lzo openssl"
-RRECOMMENDS_${PN} = "kernel-module-tun"
 
 inherit autotools
 
 SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
            file://openvpn"
 
+SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7"
+SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36"
+
 CFLAGS += "-fno-inline"
 
 # I want openvpn to be able to read password from file (hrw)
@@ -22,5 +24,4 @@ do_install_append() {
     install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
 }
 
-SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7"
-SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36"
+RRECOMMENDS_${PN} = "kernel-module-tun"
diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn.inc b/meta-oe/recipes-connectivity/openvpn/openvpn.inc
deleted file mode 100644
index 61f91a3..0000000
--- a/meta-oe/recipes-connectivity/openvpn/openvpn.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "A full-featured SSL VPN solution via tun device."
-HOMEPAGE = "http://openvpn.sourceforge.net"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-DEPENDS = "lzo openssl"
-RRECOMMENDS_${PN} = "kernel-module-tun"
-
-INC_PR = "r2"
-
-SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \
-    file://openvpn"
-S = "${WORKDIR}/openvpn-${PV}"
-
-CFLAGS += "-fno-inline"
-
-inherit autotools
-
-do_install_append() {
-    install -d ${D}/${sysconfdir}/init.d
-    install -d ${D}/${sysconfdir}/openvpn
-    install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
-}
-- 
1.7.10.4