openvpn: move to meta-networking and tweak

* 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@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 5 insertions, 26 deletions

diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn/openvpn b/meta-networking/recipes-support/openvpn/openvpn/openvpn
index a3cd6a2f49..a3cd6a2f49 100755
--- a/meta-oe/recipes-connectivity/openvpn/openvpn/openvpn
+++ b/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
index 594b2666c8..f58756e08d 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 61f91a3ea6..0000000000
--- 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
-}