Compare commits

...

2 Commits

Author SHA1 Message Date
Pau Espin b2c5b22f6c set up osmocom recipes with AUTOREV to track git master
NOTE: changes unrelated to Osmocom versions from master should be made
against the 201705 branch, not the branch here!

Change-Id: I7bcf0b88183696e1af61fc20bd4701fbdd7e582c
2023-06-13 15:36:47 +02:00
Oliver Smith 62233ca068 openvpn: bring back "openvpn@.service"
Restore "openvpn@.service" from packaging of openvpn 2.3.6, so we can
start the sysmocom vpn the same way as currently described in the
manuals.

Previous patch 8439e71a99 already
attempted to do this, but only brought back "openvpn.service" and not
"openvpn@.service".

Fixes: 8439e71a ("openvpn: bring back openvpn.service file")
Related: SYS#6303
Change-Id: I28a7f491d74690409f815555743679c69e31b518
2023-06-12 13:06:13 +02:00
4 changed files with 28 additions and 8 deletions

View File

@ -0,0 +1,17 @@
[Unit]
Description=OpenVPN connection to %i
PartOf=openvpn.service
ReloadPropagatedFrom=openvpn.service
[Service]
Type=forking
ExecStart=/usr/sbin/openvpn --daemon ovpn-%i --status /run/openvpn.%i.status 10 --cd /etc/openvpn --config /etc/openvpn/%i.conf
ExecReload=/bin/kill -HUP $MAINPID
WorkingDirectory=/etc/openvpn
Restart=always
RestartSec=2
[Install]
WantedBy=multi-user.target

View File

@ -7,11 +7,12 @@ DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '
inherit autotools systemd update-rc.d pkgconfig
PR = "r1"
PR = "r2"
SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \
file://0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch \
file://openvpn \
file://openvpn@.service \
file://openvpn.service \
"
@ -66,7 +67,8 @@ do_install_append() {
install -d -m 710 ${D}/${localstatedir}/lib/openvpn
# Keep openvpn.service to match manuals (SYS#6303)
# Keep openvpn@.service, openvpn.service to match manuals (SYS#6303)
install -m 0644 ${WORKDIR}/openvpn@.service ${D}${systemd_system_unitdir}
install -m 0644 ${WORKDIR}/openvpn.service ${D}${systemd_system_unitdir}
}
@ -77,6 +79,7 @@ RRECOMMENDS_${PN} = "kernel-module-tun"
FILES_${PN}-dbg += "${libdir}/openvpn/plugins/.debug"
FILES_${PN} += "${systemd_system_unitdir}/openvpn-server@.service \
${systemd_system_unitdir}/openvpn-client@.service \
${systemd_system_unitdir}/openvpn@.service \
${systemd_system_unitdir}/openvpn.service \
${nonarch_libdir}/tmpfiles.d \
"

View File

@ -2,9 +2,9 @@ DESCRIPTION = "sysmocom OsmoBTS"
LICENSE = "AGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788"
SRCREV = "1.6.0"
SRC_URI = "git://gerrit.osmocom.org/osmo-bts;protocol=https;destsuffix=git;tag=${SRCREV};nobranch=1"
PV = "${SRCREV}+git${SRCPV}"
SRC_URI = "git://gerrit.osmocom.org/osmo-bts;protocol=https;destsuffix=git"
SRCREV = "${AUTOREV}"
PV = "1.6.0+git${SRCPV}"
PR = "r1.${META_TELEPHONY_OSMO_INC}"
S = "${WORKDIR}/git"

View File

@ -2,9 +2,9 @@ DESCRIPTION = "Osmocom PCU for sysmoBTS"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRCREV = "1.2.0"
SRC_URI = "git://gerrit.osmocom.org/osmo-pcu;protocol=https;branch=master;nobranch=1"
PV = "${SRCREV}+git${SRCPV}"
SRC_URI = "git://gerrit.osmocom.org/osmo-pcu;protocol=https;branch=master"
SRCREV = "${AUTOREV}"
PV = "1.2.0+git${SRCPV}"
PR = "r1.${META_TELEPHONY_OSMO_INC}"
S = "${WORKDIR}/git"