diff options
-rwxr-xr-x | meta-networking/recipes-support/openvpn/openvpn/openvpn (renamed from meta-oe/recipes-connectivity/openvpn/openvpn/openvpn) | 0 | ||||
-rw-r--r-- | meta-networking/recipes-support/openvpn/openvpn_2.1.3.bb (renamed from meta-oe/recipes-connectivity/openvpn/openvpn_2.1.3.bb) | 9 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/openvpn/openvpn.inc | 22 |
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 a3cd6a2f4..a3cd6a2f4 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 594b2666c..f58756e08 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 @@ | |||
1 | DESCRIPTION = "A full-featured SSL VPN solution via tun device." | 1 | SUMMARY = "A full-featured SSL VPN solution via tun device." |
2 | HOMEPAGE = "http://openvpn.sourceforge.net" | 2 | HOMEPAGE = "http://openvpn.sourceforge.net" |
3 | SECTION = "console/network" | 3 | SECTION = "console/network" |
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" |
6 | DEPENDS = "lzo openssl" | 6 | DEPENDS = "lzo openssl" |
7 | RRECOMMENDS_${PN} = "kernel-module-tun" | ||
8 | 7 | ||
9 | inherit autotools | 8 | inherit autotools |
10 | 9 | ||
11 | SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ | 10 | SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ |
12 | file://openvpn" | 11 | file://openvpn" |
13 | 12 | ||
13 | SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" | ||
14 | SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36" | ||
15 | |||
14 | CFLAGS += "-fno-inline" | 16 | CFLAGS += "-fno-inline" |
15 | 17 | ||
16 | # I want openvpn to be able to read password from file (hrw) | 18 | # I want openvpn to be able to read password from file (hrw) |
@@ -22,5 +24,4 @@ do_install_append() { | |||
22 | install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d | 24 | install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d |
23 | } | 25 | } |
24 | 26 | ||
25 | SRC_URI[md5sum] = "7486d3e270ba4b033e311d3e022a0ad7" | 27 | RRECOMMENDS_${PN} = "kernel-module-tun" |
26 | SRC_URI[sha256sum] = "5185181df2e6043bd667377bc92e36ea5a5bd7600af209654f109b6403ca5b36" | ||
diff --git a/meta-oe/recipes-connectivity/openvpn/openvpn.inc b/meta-oe/recipes-connectivity/openvpn/openvpn.inc deleted file mode 100644 index 61f91a3ea..000000000 --- a/meta-oe/recipes-connectivity/openvpn/openvpn.inc +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | DESCRIPTION = "A full-featured SSL VPN solution via tun device." | ||
2 | HOMEPAGE = "http://openvpn.sourceforge.net" | ||
3 | SECTION = "console/network" | ||
4 | LICENSE = "GPLv2" | ||
5 | DEPENDS = "lzo openssl" | ||
6 | RRECOMMENDS_${PN} = "kernel-module-tun" | ||
7 | |||
8 | INC_PR = "r2" | ||
9 | |||
10 | SRC_URI = "http://openvpn.net/release/openvpn-${PV}.tar.gz \ | ||
11 | file://openvpn" | ||
12 | S = "${WORKDIR}/openvpn-${PV}" | ||
13 | |||
14 | CFLAGS += "-fno-inline" | ||
15 | |||
16 | inherit autotools | ||
17 | |||
18 | do_install_append() { | ||
19 | install -d ${D}/${sysconfdir}/init.d | ||
20 | install -d ${D}/${sysconfdir}/openvpn | ||
21 | install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d | ||
22 | } | ||