[oe-commits] [meta-openembedded] 26/51: openvpn: remove duplicate attempt to create dir in ${localstatedir}

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

joe_macdonald pushed a commit to branch master
in repository meta-openembedded.

commit eb0a49cc9ce4e5aa66e7168ab733974179ce1848
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>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.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.