[oe-commits] [meta-openembedded] 30/45: openvpn: remove duplicate attempt to create dir in ${localstatedir}
git at git.openembedded.org
git at git.openembedded.org
Mon Apr 24 09:03:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 05c9bb142d1fe9c7b23ac07d097e726e08d67910
Author: Andrea Galbusera <gizero at gmail.com>
AuthorDate: Wed Apr 12 15:25:57 2017 +0200
openvpn: remove duplicate attempt to create dir in ${localstatedir}
When systemd is in DISTRO_FEATURES we have two attempts to create
${localstatedir}/run/openvpn: one at build time with install command and
the other via systemd-tmpfiles at runtime which is enabled by installing
openvpn-volatile.conf. Beside looking redundant, by dropping the build-time
dir creation attempt solves the following error when building images with
both base-files and openvpn:
Error: Transaction check error:
file /var/run conflicts between attempted installs of
openvpn-2.3.9-r0.cortexa7hf_neon_vfpv4 and
base-files-3.0.14-r89.raspberrypi3
Signed-off-by: Andrea Galbusera <gizero at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb | 2 --
1 file changed, 2 deletions(-)
diff --git a/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb b/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb
index 5fd714a..8dd4566 100644
--- a/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb
+++ b/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb
@@ -47,8 +47,6 @@ do_install_append() {
install -d ${D}/${localstatedir}
install -d ${D}/${localstatedir}/lib
install -d -m 710 ${D}/${localstatedir}/lib/openvpn
- install -d -m 755 ${D}/${localstatedir}/run/
- install -d -m 755 ${D}/${localstatedir}/run/openvpn
install -d ${D}${sysconfdir}/tmpfiles.d
install -m 0644 ${WORKDIR}/openvpn-volatile.conf ${D}${sysconfdir}/tmpfiles.d/openvpn.conf
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list